summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLennart Poettering <lennart@poettering.net>2008-08-09 17:04:27 +0200
committerLennart Poettering <lennart@poettering.net>2008-08-09 17:04:27 +0200
commit72f520f93c576facf8a49af28b764e1be8ee4ad5 (patch)
tree1695285cefc7e072f27a687ae6a3521e29080876
parentafbfd5d9375919c0b6dd718d68588a5d7cf18140 (diff)
make gcc shut up
-rw-r--r--src/modules/module-stream-restore.c2
-rw-r--r--src/pulse/context.c2
-rw-r--r--src/pulse/stream.c4
3 files changed, 5 insertions, 3 deletions
diff --git a/src/modules/module-stream-restore.c b/src/modules/module-stream-restore.c
index ec4e7c79..b999304a 100644
--- a/src/modules/module-stream-restore.c
+++ b/src/modules/module-stream-restore.c
@@ -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);
diff --git a/src/pulse/context.c b/src/pulse/context.c
index bf743338..ed6415b0 100644
--- a/src/pulse/context.c
+++ b/src/pulse/context.c
@@ -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)) {
diff --git a/src/pulse/stream.c b/src/pulse/stream.c
index cfc454be..82eff4ad 100644
--- a/src/pulse/stream.c
+++ b/src/pulse/stream.c
@@ -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);