From: Eric Haszlakiewicz <erh+git@nimenees.com>
Date: Sun, 21 Oct 2012 01:10:15 +0000 (-0500)
Subject: Reformat the json_object_object_foreach macro so it is readable, and document what... 
X-Git-Tag: json-c-0.11-20130402~36
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=5abc0ea4443e46f8e508f17e3768c6404dee0d09;p=json-c

Reformat the json_object_object_foreach macro so it is readable, and document what is allowed to be done with the object while iterating.
---

diff --git a/json_object.h b/json_object.h
index 6c42fc3..3f0ec6a 100644
--- a/json_object.h
+++ b/json_object.h
@@ -287,7 +287,13 @@ extern json_bool json_object_object_get_ex(struct json_object* obj,
  */
 extern void json_object_object_del(struct json_object* obj, const char *key);
 
-/** Iterate through all keys and values of an object
+/**
+ * Iterate through all keys and values of an object.
+ *
+ * Adding or deleting keys to the object while iterating is NOT allowed.
+ *
+ * Replacing an existing key with a new value IS allowed.
+ *
  * @param obj the json_object instance
  * @param key the local name for the char* key variable defined in the body
  * @param val the local name for the json_object* object variable defined in
@@ -296,14 +302,27 @@ extern void json_object_object_del(struct json_object* obj, const char *key);
 #if defined(__GNUC__) && !defined(__STRICT_ANSI__)
 
 # define json_object_object_foreach(obj,key,val) \
- char *key; struct json_object *val; \
- for(struct lh_entry *entry = json_object_get_object(obj)->head; ({ if(entry) { key = (char*)entry->k; val = (struct json_object*)entry->v; } ; entry; }); entry = entry->next )
+	char *key; \
+	struct json_object *val; \
+	for(struct lh_entry *entry = json_object_get_object(obj)->head; \
+		({ if(entry) { \
+			key = (char*)entry->k; \
+			val = (struct json_object*)entry->v; \
+		} ; entry; }); \
+		entry = entry->next )
 
 #else /* ANSI C or MSC */
 
 # define json_object_object_foreach(obj,key,val) \
- char *key; struct json_object *val; struct lh_entry *entry; \
- for(entry = json_object_get_object(obj)->head; (entry ? (key = (char*)entry->k, val = (struct json_object*)entry->v, entry) : 0); entry = entry->next)
+	char *key;\
+	struct json_object *val; \
+	struct lh_entry *entry; \
+	for(entry = json_object_get_object(obj)->head; \
+		(entry ? ( \
+			key = (char*)entry->k, \
+			val = (struct json_object*)entry->v, \
+			entry) : 0); \
+		entry = entry->next)
 
 #endif /* defined(__GNUC__) && !defined(__STRICT_ANSI__) */