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 0833eeb55c3c8db1425c1451e3cad0bef85156f1..17f24ba143701ee41c7d2ca0a176645e2e6dd1a5 100644 (file)
--- 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 b8b2b0a90def27a6b63a4dad42df4122a85a9490..5fbb8505c3835939c5093fc7eb8ebe30e06a68ec 100644 (file)
--- 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;