Prepare for post-2.2.0 (2.2.90).

[sliver-openvswitch.git] / lib / smap.h

diff --git a/lib/smap.h b/lib/smap.h
index 51f6397..640c2a8 100644 (file)
--- a/lib/smap.h
+++ b/lib/smap.h
@@ -17,6 +17,8 @@
 
 #include "hmap.h"
 
+struct json;
+
 /* A map from string to string. */
 struct smap {
     struct hmap map;           /* Contains "struct smap_node"s. */
@@ -46,7 +48,8 @@ void smap_add_format(struct smap *, const char *key, const char *, ...)
 void smap_replace(struct smap *, const char *, const char *);
 
 void smap_remove(struct smap *, const char *);
-void smap_remove_node(struct smap *smap, struct smap_node *);
+void smap_remove_node(struct smap *, struct smap_node *);
+void smap_steal(struct smap *, struct smap_node *, char **keyp, char **valuep);
 void smap_clear(struct smap *);
 
 const char *smap_get(const struct smap *, const char *);
@@ -60,4 +63,7 @@ size_t smap_count(const struct smap *);
 void smap_clone(struct smap *dst, const struct smap *src);
 const struct smap_node **smap_sort(const struct smap *);
 
+void smap_from_json(struct smap *, const struct json *);
+struct json *smap_to_json(const struct smap *);
+
 #endif /* smap.h */