util: cast smaller type to large type

This commit is contained in:
Yu Watanabe 2018-12-02 05:58:18 +01:00
parent da96ad5ae2
commit cedfe0b02b
5 changed files with 6 additions and 6 deletions

View File

@ -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];

View File

@ -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];

View File

@ -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;

View File

@ -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];

View File

@ -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];