From 5818a2c63e9a52a545b9c8eb6fdbfa24cfee822f Mon Sep 17 00:00:00 2001
From: Maarten Bosmans <mkbosmans@gmail.com>
Date: Thu, 23 Jun 2011 22:21:03 +0200
Subject: win32: Make some unused-variable warnings go away

---
 src/pulse/stream.c  | 9 ++++-----
 src/pulse/timeval.c | 2 ++
 src/pulse/util.c    | 4 ++--
 3 files changed, 8 insertions(+), 7 deletions(-)

(limited to 'src/pulse')

diff --git a/src/pulse/stream.c b/src/pulse/stream.c
index d60b864b..373bc346 100644
--- a/src/pulse/stream.c
+++ b/src/pulse/stream.c
@@ -790,11 +790,10 @@ void pa_command_stream_event(pa_pdispatch *pd, uint32_t command, uint32_t tag, p
         goto finish;
 
     if (pa_streq(event, PA_STREAM_EVENT_FORMAT_LOST)) {
-        /* Let client know what the running time was when the stream had to be
-         * killed  */
-        pa_usec_t time;
-        if (pa_stream_get_time(s, &time) == 0)
-            pa_proplist_setf(pl, "stream-time", "%llu", (unsigned long long) time);
+        /* Let client know what the running time was when the stream had to be killed  */
+        pa_usec_t stream_time;
+        if (pa_stream_get_time(s, &stream_time) == 0)
+            pa_proplist_setf(pl, "stream-time", "%llu", (unsigned long long) stream_time);
     }
 
     if (s->event_callback)
diff --git a/src/pulse/timeval.c b/src/pulse/timeval.c
index 10ba322f..b405a70a 100644
--- a/src/pulse/timeval.c
+++ b/src/pulse/timeval.c
@@ -49,6 +49,7 @@ struct timeval *pa_gettimeofday(struct timeval *tv) {
 #else
 #define EPOCHFILETIME (116444736000000000LL)
 #endif
+{
     FILETIME ft;
     LARGE_INTEGER li;
     int64_t t;
@@ -61,6 +62,7 @@ struct timeval *pa_gettimeofday(struct timeval *tv) {
     t /= 10;                /* In microseconds */
     tv->tv_sec  = (time_t) (t / PA_USEC_PER_SEC);
     tv->tv_usec = (suseconds_t) (t % PA_USEC_PER_SEC);
+}
 #elif defined(HAVE_GETTIMEOFDAY)
     pa_assert_se(gettimeofday(tv, NULL) == 0);
 #else
diff --git a/src/pulse/util.c b/src/pulse/util.c
index ba1d2a08..6656bc3f 100644
--- a/src/pulse/util.c
+++ b/src/pulse/util.c
@@ -131,9 +131,9 @@ char *pa_get_host_name(char *s, size_t l) {
 }
 
 char *pa_get_home_dir(char *s, size_t l) {
-    char *e, *dir;
-
+    char *e;
 #ifdef HAVE_PWD_H
+    char *dir;
     struct passwd *r;
 #endif
 
-- 
cgit