util: rework load_env_file()

[elogind.git] / src / binfmt / binfmt.c

diff --git a/src/binfmt/binfmt.c b/src/binfmt/binfmt.c
index 0399ab75e046f1594f635173b29dbf33d7ec14dc..296607d6a270f7e017a3ee8992d9e5a12a4f74b5 100644 (file)
--- a/src/binfmt/binfmt.c
+++ b/src/binfmt/binfmt.c
@@ -40,7 +40,7 @@ static int delete_rule(const char *rule) {
         assert(rule[0]);
 
         if (!(x = strdup(rule)))
-                return -ENOMEM;
+                return log_oom();
 
         e = strchrnul(x+1, x[0]);
         *e = 0;
@@ -49,7 +49,7 @@ static int delete_rule(const char *rule) {
         free(x);
 
         if (!fn)
-                return -ENOMEM;
+                return log_oom();
 
         r = write_one_line_file(fn, "-1");
         free(fn);
@@ -138,7 +138,7 @@ int main(int argc, char *argv[]) {
         } else {
                 char **files, **f;
 
-                r = conf_files_list(&files, ".conf",
+                r = conf_files_list(&files, ".conf", NULL,
                                     "/etc/binfmt.d",
                                     "/run/binfmt.d",
                                     "/usr/local/lib/binfmt.d",