system-stats: Use "smap" instead of "shash".

"smap" is now the appropriate data structure for a string-to-string map.

Also changes ovsdb_datum_from_shash() into ovsdb_datum_from_smap() since
system-stats related code was the only client.

Signed-off-by: Ben Pfaff <blp@nicira.com>

1 files changed, 19 insertions, 6 deletions

diff --git a/lib/smap.c b/lib/smap.c
index ff785981..b81ac09c 100644
--- a/lib/smap.c
+++ b/lib/smap.c
@@ -125,16 +125,29 @@ 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)
+/* Deletes 'node' from 'smap'.
+ *
+ * If 'keyp' is nonnull, stores the node's key in '*keyp' and transfers
+ * ownership to the caller.  Otherwise, frees the node's key.  Similarly for
+ * 'valuep' and the node's value. */
+void
+smap_steal(struct smap *smap, struct smap_node *node,
+           char **keyp, char **valuep)
 {
-    char *key = node->key;
+    if (keyp) {
+        *keyp = node->key;
+    } else {
+        free(node->key);
+    }
+
+    if (valuep) {
+        *valuep = node->value;
+    } else {
+        free(node->value);
+    }
 
     hmap_remove(&smap->map, &node->node);
     free(node);
-    return key;
 }
 
 /* Removes all key-value pairs from 'smap'. */