summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEric Haszlakiewicz <erh+git@nimenees.com>2020-06-13 18:25:32 +0000
committerEric Haszlakiewicz <erh+git@nimenees.com>2020-06-13 18:25:32 +0000
commit4c10712114a79d1abf0d98ac165648a6aa36d45a (patch)
treeb043cfcd52d0043c8d40512db2ee94565ad8daf8
parent85c244f04807689621fca58075ab4946fad5e996 (diff)
downloadjson-c-4c10712114a79d1abf0d98ac165648a6aa36d45a.tar.gz
Drop the useless "char data[1]" from struct json_object. Fix a typo in a comment.
-rw-r--r--json_object.c2
-rw-r--r--json_object_private.h3
2 files changed, 3 insertions, 2 deletions
diff --git a/json_object.c b/json_object.c
index bed97cd..8615ff5 100644
--- a/json_object.c
+++ b/json_object.c
@@ -199,7 +199,7 @@ static inline char *get_string_component_mutable(struct json_object *jso)
{
if (JC_STRING_C(jso)->len < 0)
{
- /* Due to json_object_str_string(), we might have a pointer */
+ /* Due to json_object_set_string(), we might have a pointer */
return JC_STRING(jso)->c_string.pdata;
}
return JC_STRING(jso)->c_string.idata;
diff --git a/json_object_private.h b/json_object_private.h
index 8132a33..7cd90c2 100644
--- a/json_object_private.h
+++ b/json_object_private.h
@@ -47,7 +47,8 @@ struct json_object
struct printbuf *_pb;
json_object_delete_fn *_user_delete;
void *_userdata;
- char data[1]; // Actually the rest of a struct json_object_${o_type}
+ // Actually longer, always malloc'd as some more-specific type.
+ // The rest of a struct json_object_${o_type} follows
};
struct json_object_object