From 492dcb2eb191b844a2fd5e51db3eed85289bea1f Mon Sep 17 00:00:00 2001
From: Pádraig Brady
Date: Sat, 15 Oct 2016 23:10:35 +0100
Subject: all: use die() rather than error(EXIT_FAILURE)
die() has the advantage of being apparent to the compiler
that it doesn't return, which will avoid warnings in some cases,
and possibly generate better code.
* cfg.mk (sc_die_EXIT_FAILURE): A new syntax check rule to
catch any new uses of error (CONSTANT, ...);
---
src/selinux.c | 9 +++++----
1 file changed, 5 insertions(+), 4 deletions(-)
(limited to 'src/selinux.c')
diff --git a/src/selinux.c b/src/selinux.c
index 4ad56909f..c85d42277 100644
--- a/src/selinux.c
+++ b/src/selinux.c
@@ -21,6 +21,7 @@
#include
#include
+#include "die.h"
#include "error.h"
#include "system.h"
#include "canonicalize.h"
@@ -123,8 +124,8 @@ defaultcon (char const *path, mode_t mode)
with libselinux < 2.1.5 2011-0826. */
newpath = canonicalize_filename_mode (path, CAN_MISSING);
if (! newpath)
- error (EXIT_FAILURE, errno, _("error canonicalizing %s"),
- quoteaf (path));
+ die (EXIT_FAILURE, errno, _("error canonicalizing %s"),
+ quoteaf (path));
path = newpath;
}
@@ -296,8 +297,8 @@ restorecon (char const *path, bool recurse, bool local)
fts entries, which may be quicker to process in any case. */
newpath = canonicalize_filename_mode (path, CAN_MISSING);
if (! newpath)
- error (EXIT_FAILURE, errno, _("error canonicalizing %s"),
- quoteaf (path));
+ die (EXIT_FAILURE, errno, _("error canonicalizing %s"),
+ quoteaf (path));
}
const char *ftspath[2] = { newpath ? newpath : path, NULL };
--
cgit v1.2.3-54-g00ecf