[PATCH 5/8] Move ENOENT error message into conf_ns_opt()

[David Gibson <david@gibson.dropbear.id.au>]

[-- Attachment #1: Type: text/plain, Size: 941 bytes --]

After calling conf_ns_opt() we check for -ENOENT and print an error
message, but conf_ns_opt() prints messages for other errors itself.  For
consistency move the ENOENT message into conf_ns_opt() as well.

Signed-off-by: David Gibson <david(a)gibson.dropbear.id.au>
---
 conf.c | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/conf.c b/conf.c
index e76181c..47f3e41 100644
--- a/conf.c
+++ b/conf.c
@@ -602,6 +602,7 @@ static int conf_ns_opt(struct ctx *c,
 
 	c->netns_only = netns_only_reset;
 
+	err("Namespace %s not found", optarg);
 	return -ENOENT;
 }
 
@@ -1446,8 +1447,6 @@ void conf(struct ctx *c, int argc, char **argv)
 
 	if (c->mode == MODE_PASTA && optind + 1 == argc) {
 		ret = conf_ns_opt(c, userns, argv[optind]);
-		if (ret == -ENOENT)
-			err("Namespace %s not found", argv[optind]);
 		if (ret < 0)
 			usage(argv[0]);
 	} else if (c->mode == MODE_PASTA && *userns && optind == argc) {
-- 
@@ -602,6 +602,7 @@ static int conf_ns_opt(struct ctx *c,
 
 	c->netns_only = netns_only_reset;
 
+	err("Namespace %s not found", optarg);
 	return -ENOENT;
 }
 
@@ -1446,8 +1447,6 @@ void conf(struct ctx *c, int argc, char **argv)
 
 	if (c->mode == MODE_PASTA && optind + 1 == argc) {
 		ret = conf_ns_opt(c, userns, argv[optind]);
-		if (ret == -ENOENT)
-			err("Namespace %s not found", argv[optind]);
 		if (ret < 0)
 			usage(argv[0]);
 	} else if (c->mode == MODE_PASTA && *userns && optind == argc) {
-- 
2.37.2