Source code reorganization:

[disorder] / lib / client.c

diff --git a/lib/client.c b/lib/client.c
index e7fba81f5d6ab3d1c89f2f401ab7c52e6f8da75c..84eb77e539310175b8aeaf94b9d303f98ad8200c 100644 (file)
--- a/lib/client.c
+++ b/lib/client.c
@@ -24,19 +24,15 @@
  * implementation.
  */
 
-#include <config.h>
-#include "types.h"
+#include "common.h"
 
 #include <sys/types.h>
 #include <sys/socket.h>
 #include <netinet/in.h>
 #include <sys/un.h>
-#include <string.h>
-#include <stdio.h>
 #include <unistd.h>
 #include <errno.h>
 #include <netdb.h>
-#include <stdlib.h>
 #include <pcre.h>
 
 #include "log.h"
@@ -1289,12 +1285,16 @@ int disorder_schedule_add(disorder_client *c,
   snprintf(when_str, sizeof when_str, "%lld", (long long)when);
   va_start(ap, action);
   if(!strcmp(action, "play"))
-    rc = disorder_simple(c, 0, when_str, priority,
-                        action, va_arg(ap, char *));
-  else if(!strcmp(action, "set-global"))
-    rc = disorder_simple(c, 0, when_str, priority,
-                        action, va_arg(ap, char *), va_arg(ap, char *));
-  else
+    rc = disorder_simple(c, 0, "schedule-add", when_str, priority,
+                        action, va_arg(ap, char *),
+                        (char *)0);
+  else if(!strcmp(action, "set-global")) {
+    const char *key = va_arg(ap, char *);
+    const char *value = va_arg(ap, char *);
+    rc = disorder_simple(c, 0,"schedule-add",  when_str, priority,
+                        action, key, value,
+                        (char *)0);
+  } else
     fatal(0, "unknown action '%s'", action);
   va_end(ap);
   return rc;