smap: New function smap_steal().

[openvswitch] / lib / smap.c

diff --git a/lib/smap.c b/lib/smap.c
index 866532156d3cae7348bf24d4dd5c3f689122beb2..ff785981226425d7a42dd34e44e44d2ea617a295 100644 (file)
--- a/lib/smap.c
+++ b/lib/smap.c
@@ -18,6 +18,7 @@
 #include <assert.h>
 
 #include "hash.h"
+#include "json.h"
 
 static struct smap_node *smap_add__(struct smap *, char *, void *,
                                     size_t hash);
@@ -124,6 +125,18 @@ smap_remove_node(struct smap *smap, struct smap_node *node)
     free(node);
 }
 
+/* Deletes 'node' from 'sh'.  Neither the node's key nor its value is freed;
+ * instead, ownership is transferred to the caller.  Returns the node's key. */
+char *
+smap_steal(struct smap *smap, struct smap_node *node)
+{
+    char *key = node->key;
+
+    hmap_remove(&smap->map, &node->node);
+    free(node);
+    return key;
+}
+
 /* Removes all key-value pairs from 'smap'. */
 void
 smap_clear(struct smap *smap)
@@ -232,6 +245,41 @@ smap_sort(const struct smap *smap)
         return nodes;
     }
 }
+
+/* Adds each of the key-value pairs from 'json' (which must be a JSON object
+ * whose values are strings) to 'smap'.
+ *
+ * The caller must have initialized 'smap'.
+ *
+ * The caller retains ownership of 'json' and everything in it. */
+void
+smap_from_json(struct smap *smap, const struct json *json)
+{
+    const struct shash_node *node;
+
+    SHASH_FOR_EACH (node, json_object(json)) {
+        const struct json *value = node->data;
+        smap_add(smap, node->name, json_string(value));
+    }
+}
+
+/* Returns a JSON object that maps from the keys in 'smap' to their values.
+ *
+ * The caller owns the returned value and must eventually json_destroy() it.
+ *
+ * The caller retains ownership of 'smap' and everything in it. */
+struct json *
+smap_to_json(const struct smap *smap)
+{
+    const struct smap_node *node;
+    struct json *json;
+
+    json = json_object_create();
+    SMAP_FOR_EACH (node, smap) {
+        json_object_put_string(json, node->key, node->value);
+    }
+    return json;
+}
 \f
 /* Private Helpers. */