Hostinfo day 6: RPM packaging, initscripts, hostinfo-status, hostinfo-test.

[virt-hostinfo.git] / hostinfod / commands.c

diff --git a/hostinfod/commands.c b/hostinfod/commands.c
index cb66179..8fd2246 100644 (file)
--- a/hostinfod/commands.c
+++ b/hostinfod/commands.c
@@ -37,9 +37,11 @@
 #include <apr_general.h>
 #include <apr_pools.h>
 #include <apr_hash.h>
+#include <apr_tables.h>
 #include <apr_strings.h>
 
 #include "hostinfod.h"
+#include "apr12-compat.h"
 
 #define PROTOCOL_VERSION "1.0"
 #define CRLF "\r\n"
@@ -88,7 +90,7 @@ execute_command (const struct timespec *now,
    */
   len = strlen (command);
   if (len < 1 || len > 4094 || not_printable (command)) {
-    warning ("%s: command too short, too long or contained unprintable chars (len = %d)",
+    warning ("%s: command too short, too long or contained unprintable chars (len = %zu)",
             hval->name, len);
     send_error (hval, 400);
     return;
@@ -173,7 +175,7 @@ execute_command (const struct timespec *now,
 
     default:
     unknown_arg:
-      warning ("%s: unknown or malformed argument starting at position %d ('%c')",
+      warning ("%s: unknown or malformed argument starting at position %zu ('%c')",
               hval->name, i, command[i]);
       send_error (hval, 400);
       return;
@@ -191,11 +193,11 @@ execute_command (const struct timespec *now,
       switch (arg.type) {
       case arg_type_bool:
       case arg_type_int:
-       debug ("%s: arg %d : %s = %ld",
+       debug ("%s: arg %zu : %s = %ld",
               hval->name, i, string_of_arg_type (arg.type), arg.u.i);
        break;
       case arg_type_string:
-       debug ("%s: arg %d : %s = %s",
+       debug ("%s: arg %zu : %s = %s",
               hval->name, i, string_of_arg_type (arg.type), arg.u.str);
        break;
       }