From: Yu Watanabe <watanabe.yu+github@gmail.com>
Date: Sun, 2 Dec 2018 04:58:18 +0000 (+0100)
Subject: util: cast smaller type to large type
X-Git-Tag: v240~154^2~5
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=cedfe0b02b3cab6281106a6f4e090336b3ca487f;p=thirdparty%2Fsystemd.git

util: cast smaller type to large type
---

diff --git a/src/basic/af-list.c b/src/basic/af-list.c
index cf03dfc6d39..abad221d58a 100644
--- a/src/basic/af-list.c
+++ b/src/basic/af-list.c
@@ -17,7 +17,7 @@ const char *af_to_name(int id) {
         if (id <= 0)
                 return NULL;
 
-        if (id >= (int) ELEMENTSOF(af_names))
+        if ((size_t) id >= ELEMENTSOF(af_names))
                 return NULL;
 
         return af_names[id];
diff --git a/src/basic/arphrd-list.c b/src/basic/arphrd-list.c
index a6b8fa9d84b..8652863cac5 100644
--- a/src/basic/arphrd-list.c
+++ b/src/basic/arphrd-list.c
@@ -17,7 +17,7 @@ const char *arphrd_to_name(int id) {
         if (id <= 0)
                 return NULL;
 
-        if (id >= (int) ELEMENTSOF(arphrd_names))
+        if ((size_t) id >= ELEMENTSOF(arphrd_names))
                 return NULL;
 
         return arphrd_names[id];
diff --git a/src/basic/cap-list.c b/src/basic/cap-list.c
index bfcda335201..29a17d9320e 100644
--- a/src/basic/cap-list.c
+++ b/src/basic/cap-list.c
@@ -22,7 +22,7 @@ const char *capability_to_name(int id) {
         if (id < 0)
                 return NULL;
 
-        if (id >= (int) ELEMENTSOF(capability_names))
+        if ((size_t) id >= ELEMENTSOF(capability_names))
                 return NULL;
 
         return capability_names[id];
@@ -37,7 +37,7 @@ int capability_from_name(const char *name) {
         /* Try to parse numeric capability */
         r = safe_atoi(name, &i);
         if (r >= 0) {
-                if (i >= 0 && i < (int) ELEMENTSOF(capability_names))
+                if (i >= 0 && (size_t) i < ELEMENTSOF(capability_names))
                         return i;
                 else
                         return -EINVAL;
diff --git a/src/basic/errno-list.c b/src/basic/errno-list.c
index 1b72bbf3ad9..44cc5705396 100644
--- a/src/basic/errno-list.c
+++ b/src/basic/errno-list.c
@@ -17,7 +17,7 @@ const char *errno_to_name(int id) {
         if (id < 0)
                 id = -id;
 
-        if (id >= (int) ELEMENTSOF(errno_names))
+        if ((size_t) id >= ELEMENTSOF(errno_names))
                 return NULL;
 
         return errno_names[id];
diff --git a/src/shared/ip-protocol-list.c b/src/shared/ip-protocol-list.c
index 9a1c11b0d8b..775cd3313d1 100644
--- a/src/shared/ip-protocol-list.c
+++ b/src/shared/ip-protocol-list.c
@@ -17,7 +17,7 @@ const char *ip_protocol_to_name(int id) {
         if (id < 0)
                 return NULL;
 
-        if (id >= (int) ELEMENTSOF(ip_protocol_names))
+        if ((size_t) id >= ELEMENTSOF(ip_protocol_names))
                 return NULL;
 
         return ip_protocol_names[id];