Squash the last gcc warnings

diff --git a/src/pulse/ext-device-restore.c b/src/pulse/ext-device-restore.c
index 7d7b24f7d322a98a5ee896bca237c4450d5eef9e..25d33d129720e08a053214267c093df1af2832e2 100644 (file)
--- a/src/pulse/ext-device-restore.c
+++ b/src/pulse/ext-device-restore.c
@@ -203,7 +203,7 @@ static void ext_device_restore_read_device_formats_cb(pa_pdispatch *pd, uint32_t
                         uint8_t k;
 
                         pa_context_fail(o->context, PA_ERR_PROTOCOL);
-                        for (k = 0; k <= j; k++)
+                        for (k = 0; k < j+1; k++)
                             pa_format_info_free(i.formats[k]);
                         pa_xfree(i.formats);
                         goto finish;

diff --git a/src/pulsecore/memtrap.c b/src/pulsecore/memtrap.c
index 4df1fb715cacf0dacc4ce4906bf0d707c1a23344..4236934ea53dc829cd8761e5e1877d11c32bcf47 100644 (file)
--- a/src/pulsecore/memtrap.c
+++ b/src/pulsecore/memtrap.c
@@ -69,7 +69,8 @@ pa_bool_t pa_memtrap_is_good(pa_memtrap *m) {
 
 #ifdef HAVE_SIGACTION
 static void sigsafe_error(const char *s) {
-    (void) write(STDERR_FILENO, s, strlen(s));
+    size_t ret PA_GCC_UNUSED;
+    ret = write(STDERR_FILENO, s, strlen(s));
 }
 
 static void signal_handler(int sig, siginfo_t* si, void *data) {