Date: Mon, 11 Feb 2013 08:49:58 -0600
From: Serge Hallyn <serge.hallyn@ubuntu.com>
Subject: [PATCH (v2)] Small cleanups to address compiler warnings
Message-ID: <20130211144958.GA6481@sergelap>
Forwarded: yes

Changelog: Feb 11: Address feedback by Marc-André:

Signed-off-by: Serge Hallyn <serge.hallyn@ubuntu.com>
---
 server/tests/basic_event_loop.c  | 4 ++--
 server/tests/test_display_base.c | 8 +++++---
 2 files changed, 7 insertions(+), 5 deletions(-)

--- a/server/tests/basic_event_loop.c
+++ b/server/tests/basic_event_loop.c
@@ -115,7 +115,7 @@
 
 static void channel_event(int event, SpiceChannelEventInfo *info)
 {
-    DPRINTF(0, "channel event con, type, id, event: %ld, %d, %d, %d",
+    DPRINTF(0, "channel event con, type, id, event: %d, %d, %d, %d",
             info->connection_id, info->type, info->id, event);
 }
 
@@ -215,7 +215,7 @@
         if ((next_timer = get_next_timer()) != NULL) {
             calc_next_timeout(next_timer, &next_timer_timeout);
             timeout = &next_timer_timeout;
-            DPRINTF(2, "timeout of %zd.%06zd",
+            DPRINTF(2, "timeout of %ld.%06ld",
                     timeout->tv_sec, timeout->tv_usec);
         } else {
             timeout = NULL;
--- a/server/tests/test_display_base.c
+++ b/server/tests/test_display_base.c
@@ -88,10 +88,11 @@
     pid = fork();
     if (pid == 0) {
         char buf[PATH_MAX];
+        char *argp[] = {NULL};
         char *envp[] = {buf, NULL};
 
         snprintf(buf, sizeof(buf), "PATH=%s", getenv("PATH"));
-        execve("regression_test.py", NULL, envp);
+        execve("regression_test.py", argp, envp);
     } else if (pid > 0) {
         return;
     }
