]> code.delx.au - pulseaudio/commitdiff
make gcc shut up
authorLennart Poettering <lennart@poettering.net>
Sat, 9 Aug 2008 15:04:27 +0000 (17:04 +0200)
committerLennart Poettering <lennart@poettering.net>
Sat, 9 Aug 2008 15:04:27 +0000 (17:04 +0200)
src/modules/module-stream-restore.c
src/pulse/context.c
src/pulse/stream.c

index ec4e7c7992912e8b418d5d7af990b2bccc317c95..b999304a73416f4b398002206f43d655fa6fc374 100644 (file)
@@ -490,7 +490,7 @@ static void dump_database(struct userdata *u) {
 static int extension_cb(pa_native_protocol *p, pa_module *m, pa_native_connection *c, uint32_t tag, pa_tagstruct *t) {
     struct userdata *u;
     uint32_t command;
-    pa_tagstruct *reply;
+    pa_tagstruct *reply = NULL;
 
     pa_assert(p);
     pa_assert(m);
index bf7433386dd6d1754a237c8ea0d6e07e8beedcc0..ed6415b080e931ee0fd892c406dfa8a66beb63af 100644 (file)
@@ -439,7 +439,7 @@ static void setup_complete_callback(pa_pdispatch *pd, uint32_t command, uint32_t
     switch(c->state) {
         case PA_CONTEXT_AUTHORIZING: {
             pa_tagstruct *reply;
-            pa_bool_t shm_on_remote;
+            pa_bool_t shm_on_remote = FALSE;
 
             if (pa_tagstruct_getu32(t, &c->version) < 0 ||
                 !pa_tagstruct_eof(t)) {
index cfc454be45b01e99288849a06559a4d07f1fe4de..82eff4addd22307982e57983ff9b27adca977834 100644 (file)
@@ -1257,7 +1257,9 @@ static pa_usec_t calc_time(pa_stream *s, pa_bool_t ignore_transport) {
                 usec -= s->timing_info.sink_usec;
         }
 
-    } else if (s->direction == PA_STREAM_RECORD) {
+    } else {
+        pa_assert(s->direction == PA_STREAM_RECORD);
+
         /* The last byte written into the server side queue had
          * this time value associated */
         usec = pa_bytes_to_usec(s->timing_info.write_index < 0 ? 0 : (uint64_t) s->timing_info.write_index, &s->sample_spec);