From: Ruediger Meier <ruediger.meier@ga-group.nl>
Date: Thu, 22 Jun 2017 20:18:14 +0000 (+0200)
Subject: misc: fix optutils.h related exit codes
X-Git-Tag: v2.31-rc1~267^2
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=39aa4e3978ba38d8729cdd098e104b2ccc07ce3a;p=thirdparty%2Futil-linux.git

misc: fix optutils.h related exit codes

Found by:

  grep -L "OPTUTILS_EXIT_CODE" $(grep -l "err_exclusive_options" \
      $(git grep -l "_EX_\|FINDFS_\|BLKID_EXIT\|EX_USAGE" -- "*.c"))

Signed-off-by: Ruediger Meier <ruediger.meier@ga-group.nl>
---

diff --git a/sys-utils/umount.c b/sys-utils/umount.c
index 2dfb139750..57140a660d 100644
--- a/sys-utils/umount.c
+++ b/sys-utils/umount.c
@@ -32,7 +32,6 @@
 #include "nls.h"
 #include "c.h"
 #include "env.h"
-#include "optutils.h"
 #include "closestream.h"
 #include "pathnames.h"
 #include "canonicalize.h"
@@ -40,6 +39,9 @@
 #define XALLOC_EXIT_CODE MNT_EX_SYSERR
 #include "xalloc.h"
 
+#define OPTUTILS_EXIT_CODE MNT_EX_USAGE
+#include "optutils.h"
+
 static int table_parser_errcb(struct libmnt_table *tb __attribute__((__unused__)),
 			const char *filename, int line)
 {