dilim/systemd
1
0
Fork 0
mirror of https://github.com/systemd/systemd.git synced 2026-07-14 11:30:45 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #10992 from yuwata/follow-up-10948

Browse Source 
network: make fib rule accept arbitrary ip protocol
This commit is contained in:
Lennart Poettering
2018-12-03 11:09:04 +01:00
committed by GitHub
parent 9714c020fc d2b42d63c4
commit ad2bf5df89
24 changed files with 192 additions and 96 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/basic/af-list.c
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];

2
src/basic/arphrd-list.c
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];

4
src/basic/cap-list.c
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;

2
src/basic/errno-list.c
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];