From: Arran Cudbard-Bell <a.cudbardb@freeradius.org>
Date: Wed, 26 Sep 2018 06:07:09 +0000 (+0800)
Subject: Silence various compiler warnings in Clang 7.0
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=cd7b5ee63a0dc9b106609767f6278bee6aeb686c;p=thirdparty%2Ffreeradius-server.git

Silence various compiler warnings in Clang 7.0
---

diff --git a/src/lib/json/jpath.c b/src/lib/json/jpath.c
index 0a911bd83fd..15769f7a328 100644
--- a/src/lib/json/jpath.c
+++ b/src/lib/json/jpath.c
@@ -172,7 +172,7 @@ static int jpath_evaluate(TALLOC_CTX *ctx, fr_value_box_t ***tail,
 
 			if (!fr_json_object_is_type(object, json_type_array)) return 0;
 			array_obj = json_object_get_array(object);
-			if (selector->slice[0] >= array_obj->length) continue;
+			if ((selector->slice[0] < 0) || ((size_t)selector->slice[0] >= array_obj->length)) continue;
 
 			ret = jpath_evaluate(ctx, tail, dst_type, dst_enumv,
 					     array_obj->array[selector->slice[0]], node->next);
@@ -208,7 +208,7 @@ static int jpath_evaluate(TALLOC_CTX *ctx, fr_value_box_t ***tail,
 			 *	Descending
 			 */
 			if (step < 0) for (i = start; (i > end) && (i >= 0); i += step) {
-				rad_assert((i >= 0) && (i < array_obj->length));
+				rad_assert((i >= 0) && ((size_t)i < array_obj->length));
 				ret = jpath_evaluate(ctx, tail, dst_type, dst_enumv,
 						     array_obj->array[i], node->next);
 				if (ret < 0) return ret;
@@ -216,8 +216,8 @@ static int jpath_evaluate(TALLOC_CTX *ctx, fr_value_box_t ***tail,
 			/*
 			 *	Ascending
 			 */
-			} else for (i = start; (i < end) && (i < array_obj->length); i += step) {
-				rad_assert((i >= 0) && (i < array_obj->length));
+			} else for (i = start; (i < end) && ((size_t)i < array_obj->length); i += step) {
+				rad_assert((i >= 0) && ((size_t)i < array_obj->length));
 				ret = jpath_evaluate(ctx, tail, dst_type, dst_enumv,
 						     array_obj->array[i], node->next);
 				if (ret < 0) return ret;
@@ -243,7 +243,7 @@ static int jpath_evaluate(TALLOC_CTX *ctx, fr_value_box_t ***tail,
 			struct array_list *array_obj;
 
 			array_obj = json_object_get_array(object);
-			for (i = 0; i < array_obj->length; i++) {
+			for (i = 0; (size_t)i < array_obj->length; i++) {
 				ret = jpath_evaluate(ctx, tail, dst_type, dst_enumv,
 						     array_obj->array[i], node->next);
 				if (ret < 0) return ret;
@@ -280,7 +280,7 @@ static int jpath_evaluate(TALLOC_CTX *ctx, fr_value_box_t ***tail,
 			 *	Descend into each element of the array
 			 */
 			array_obj = json_object_get_array(object);
-			for (i = 0; i < array_obj->length; i++) {
+			for (i = 0; (size_t)i < array_obj->length; i++) {
 				ret = jpath_evaluate(ctx, tail, dst_type, dst_enumv,
 						     array_obj->array[i], node);
 				if (ret < 0) return ret;
diff --git a/src/lib/json/json_missing.h b/src/lib/json/json_missing.h
index 41b6697edb7..762474f3c35 100644
--- a/src/lib/json/json_missing.h
+++ b/src/lib/json/json_missing.h
@@ -87,12 +87,12 @@ enum json_tokener_error json_tokener_get_error(json_tokener *tok);
 		entry = entry->next)
 #else /* ANSI C or MSC */
 #  define json_object_object_foreach(obj, key, val) \
-	char *key = NULL; \
+	char const *key = NULL; \
 	struct json_object *val = NULL; \
 	struct lh_entry *entry; \
 	union ctn_u {const void *cdata; void *data; } ctn; \
 	for (entry = json_object_get_object(obj)->head; \
-		(entry ? (key = (char *)entry->k, ctn.cdata = entry->v, \
+		(entry ? (key = (char const *)entry->k, ctn.cdata = entry->v, \
 		val = (struct json_object *)ctn.data, entry) : 0); entry = entry->next)
 #endif /* defined(__GNUC__) && !defined(__STRICT_ANSI__) */
 #endif
diff --git a/src/modules/rlm_couchbase/mod.c b/src/modules/rlm_couchbase/mod.c
index eb100be983e..3b5e3eaa899 100644
--- a/src/modules/rlm_couchbase/mod.c
+++ b/src/modules/rlm_couchbase/mod.c
@@ -713,7 +713,7 @@ int mod_load_client_documents(rlm_couchbase_t *inst, CONF_SECTION *tmpl, CONF_SE
 	}
 
 	/* loop across all row elements */
-	for (idx = 0; idx < json_object_array_length(jrows); idx++) {
+	for (idx = 0; (size_t)idx < json_object_array_length(jrows); idx++) {
 		/* fetch current index */
 		json = json_object_array_get_idx(jrows, idx);