Add kvp_make(), to make a kvp list in a single function call.

[disorder] / lib / kvp.c

diff --git a/lib/kvp.c b/lib/kvp.c
index 4aa31a1ee7a76b066efb0d0b87b3c84172d32103..c56249d2e707df687768fd4708e2ae96786e9226 100644 (file)
--- a/lib/kvp.c
+++ b/lib/kvp.c
@@ -18,11 +18,7 @@
  * USA
  */
 
-#include <config.h>
-#include "types.h"
-
-#include <string.h>
-#include <stdio.h>
+#include "common.h"
 
 #include "mem.h"
 #include "kvp.h"
@@ -205,6 +201,25 @@ const char *kvp_get(const struct kvp *kvp, const char *name) {
   return kvp ? kvp->value : 0;
 }
 
+struct kvp *kvp_make(const char *name, ...) {
+  const char *value;
+  struct kvp *kvp = 0, *k;
+  va_list ap;
+
+  va_start(ap, name);
+  while(name) {
+    value = va_arg(ap, const char *);
+    k = xmalloc(sizeof *k);
+    k->name = name;
+    k->value = value ? xstrdup(value) : value;
+    k->next = kvp;
+    kvp = k;
+    name = va_arg(ap, const char *);
+  }
+  va_end(ap);
+  return kvp;
+}
+
 /*
 Local Variables:
 c-basic-offset:2