From 595891729ecf39eac42536e12024435f5d8ea8fe Mon Sep 17 00:00:00 2001 From: Eric Haszlakiewicz Date: Sat, 11 Jun 2016 18:18:46 +0000 Subject: Issue #236: Add -Wcast-qual and fix casts to retain constness. To better distinguish between entry->k and entry->v being const within linkhash, but non-const outside, add lh_entry_v() and lh_entry_k() accessors. Make lh_entry->k const. --- json_object_iterator.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'json_object_iterator.c') diff --git a/json_object_iterator.c b/json_object_iterator.c index 7066649..7c2a25b 100644 --- a/json_object_iterator.c +++ b/json_object_iterator.c @@ -105,7 +105,7 @@ json_object_iter_next(struct json_object_iterator* iter) JASSERT(NULL != iter); JASSERT(kObjectEndIterValue != iter->opaque_); - iter->opaque_ = ((struct lh_entry *)iter->opaque_)->next; + iter->opaque_ = ((const struct lh_entry *)iter->opaque_)->next; } @@ -118,7 +118,7 @@ json_object_iter_peek_name(const struct json_object_iterator* iter) JASSERT(NULL != iter); JASSERT(kObjectEndIterValue != iter->opaque_); - return (const char*)(((struct lh_entry *)iter->opaque_)->k); + return (const char*)(((const struct lh_entry *)iter->opaque_)->k); } @@ -131,7 +131,7 @@ json_object_iter_peek_value(const struct json_object_iterator* iter) JASSERT(NULL != iter); JASSERT(kObjectEndIterValue != iter->opaque_); - return (struct json_object*)(((struct lh_entry *)iter->opaque_)->v); + return (struct json_object*)lh_entry_v((const struct lh_entry *)iter->opaque_); } -- cgit v1.2.1