From: Herwin Weststrate <herwin@snt.utwente.nl>
Date: Sat, 12 Nov 2016 13:10:35 +0000 (+0100)
Subject: Removed impossible to reach else statements
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=845f13de8f8de5ca73ebb88454b0bddb6abc7cae;p=thirdparty%2Ffreeradius-server.git

Removed impossible to reach else statements

We had "if (<int> < 0)" else "else if (<int> >= 0)", which cover all
possibilities
---

diff --git a/src/modules/rlm_json/json.c b/src/modules/rlm_json/json.c
index 0833eeb55c3..17f24ba1437 100644
--- a/src/modules/rlm_json/json.c
+++ b/src/modules/rlm_json/json.c
@@ -101,13 +101,10 @@ int fr_json_object_to_value_data(TALLOC_CTX *ctx, value_data_t *out, json_object
 			src_type = PW_TYPE_SHORT;
 			in.ushort = (uint16_t) num;
 			in.length = sizeof(in.ushort);
-		} else if (num >= 0) {		/* 8bit unsigned (supported) */
+		} else {		/* 8bit unsigned (supported) */
 			src_type = PW_TYPE_BYTE;
 			in.byte = (uint8_t) num;
 			in.length = sizeof(in.byte);
-		} else {
-			rad_assert(0);
-			return -1;
 		}
 	}
 		break;
diff --git a/src/modules/rlm_redis/redis.c b/src/modules/rlm_redis/redis.c
index b8b2b0a90de..5fbb8505c38 100644
--- a/src/modules/rlm_redis/redis.c
+++ b/src/modules/rlm_redis/redis.c
@@ -230,12 +230,10 @@ int fr_redis_reply_to_value_data(TALLOC_CTX *ctx, value_data_t *out, redisReply
 			in.ushort = (uint16_t) reply->integer;
 			in.length = sizeof(in.ushort);
 		}
-		else if (reply->integer >= 0) {		/* 8bit unsigned (supported) */
+		else {		/* 8bit unsigned (supported) */
 			src_type = PW_TYPE_BYTE;
 			in.byte = (uint8_t) reply->integer;
 			in.length = sizeof(in.byte);
-		} else {
-			rad_assert(0);
 		}
 		break;