From 7f0a55d4325f7df91f91b3b818f61f97d78df14a Mon Sep 17 00:00:00 2001 From: Josh Triplett Date: Wed, 29 Oct 2014 05:02:56 -0700 Subject: Introduce CONF_DIRS_NULSTR helper to define standard conf dirs Several different systemd tools define a nulstr containing a standard series of configuration file directories, in /etc, /run, /usr/local/lib, /usr/lib, and (#ifdef HAVE_SPLIT_USR) /lib. Factor that logic out into a new helper macro, CONF_DIRS_NULSTR. --- src/binfmt/binfmt.c | 10 +--------- 1 file changed, 1 insertion(+), 9 deletions(-) (limited to 'src/binfmt/binfmt.c') diff --git a/src/binfmt/binfmt.c b/src/binfmt/binfmt.c index c1c152239b..0a15fafc60 100644 --- a/src/binfmt/binfmt.c +++ b/src/binfmt/binfmt.c @@ -36,15 +36,7 @@ #include "fileio.h" #include "build.h" -static const char conf_file_dirs[] = - "/etc/binfmt.d\0" - "/run/binfmt.d\0" - "/usr/local/lib/binfmt.d\0" - "/usr/lib/binfmt.d\0" -#ifdef HAVE_SPLIT_USR - "/lib/binfmt.d\0" -#endif - ; +static const char conf_file_dirs[] = CONF_DIRS_NULSTR("binfmt"); static int delete_rule(const char *rule) { _cleanup_free_ char *x = NULL, *fn = NULL; -- cgit v1.2.3-54-g00ecf