matthias
/
iproute2
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

ipnetns: remove blank lines printed by invarg() messages 

Since invarg() automatically adds a '\n' character, having one in the
error message generates an extra blank line.

Signed-off-by: Guillaume Nault <gnault@redhat.com>
Signed-off-by: David Ahern <dsahern@gmail.com>
This commit is contained in:
Guillaume Nault 2019-11-08 18:00:20 +01:00 committed by David Ahern
parent 1c9b69276c
commit d0b645a51e
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
ip/ipnetns.c
View File

@ -439,10 +439,10 @@ static int netns_list_id(int argc, char **argv)
NEXT_ARG();
if (get_integer(&filter.target_nsid, *argv, 0))
invarg("\"target-nsid\" value is invalid\n",
invarg("\"target-nsid\" value is invalid",
*argv);
else if (filter.target_nsid < 0)
invarg("\"target-nsid\" value should be >= 0\n",
invarg("\"target-nsid\" value should be >= 0",
argv[1]);
} else if (strcmp(*argv, "nsid") == 0) {
if (nsid >= 0)
@ -450,9 +450,9 @@ static int netns_list_id(int argc, char **argv)
NEXT_ARG();
if (get_integer(&nsid, *argv, 0))
invarg("\"nsid\" value is invalid\n", *argv);
invarg("\"nsid\" value is invalid", *argv);
else if (nsid < 0)
invarg("\"nsid\" value should be >= 0\n",
invarg("\"nsid\" value should be >= 0",
argv[1]);
} else
usage();
@ -932,9 +932,9 @@ static int netns_set(int argc, char **argv)
if (strcmp(argv[1], "auto") == 0)
nsid = -1;
else if (get_integer(&nsid, argv[1], 0))
invarg("Invalid \"netnsid\" value\n", argv[1]);
invarg("Invalid \"netnsid\" value", argv[1]);
else if (nsid < 0)
invarg("\"netnsid\" value should be >= 0\n", argv[1]);
invarg("\"netnsid\" value should be >= 0", argv[1]);
snprintf(netns_path, sizeof(netns_path), "%s/%s", NETNS_RUN_DIR, name);
netns = open(netns_path, O_RDONLY | O_CLOEXEC);