update TODO

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

diff --git a/src/delta/delta.c b/src/delta/delta.c
index 1a5b08a7d09e8c7283e26f6e26de62aeefcd278b..aec3dc899505cad7a78c33ca9c26d9e9419f9060 100644 (file)
--- a/src/delta/delta.c
+++ b/src/delta/delta.c
@@ -47,24 +47,17 @@ static enum {
 } arg_flags = 0;
 
 static int equivalent(const char *a, const char *b) {
-        char *x, *y;
-        int r;
+        _cleanup_free_ char *x = NULL, *y = NULL;
 
         x = canonicalize_file_name(a);
         if (!x)
                 return -errno;
 
         y = canonicalize_file_name(b);
-        if (!y) {
-                free(x);
+        if (!y)
                 return -errno;
-        }
-
-        r = path_equal(x, y);
-        free(x);
-        free(y);
 
-        return r;
+        return path_equal(x, y);
 }
 
 static int notify_override_masked(const char *top, const char *bottom) {
@@ -108,7 +101,7 @@ static int notify_override_unchanged(const char *f) {
 }
 
 static int found_override(const char *top, const char *bottom) {
-        char *dest;
+        _cleanup_free_ char *dest = NULL;
         int k;
         pid_t pid;
 
@@ -117,7 +110,7 @@ static int found_override(const char *top, const char *bottom) {
 
         if (null_or_empty_path(top) > 0) {
                 notify_override_masked(top, bottom);
-                goto finish;
+                return 0;
         }
 
         k = readlink_malloc(top, &dest);
@@ -127,13 +120,12 @@ static int found_override(const char *top, const char *bottom) {
                 else
                         notify_override_redirected(top, bottom);
 
-                free(dest);
-                goto finish;
+                return 0;
         }
 
         notify_override_overridden(top, bottom);
         if (!arg_diff)
-                goto finish;
+                return 0;
 
         putchar('\n');
 
@@ -153,14 +145,11 @@ static int found_override(const char *top, const char *bottom) {
 
         putchar('\n');
 
-finish:
-
         return 0;
 }
 
 static int enumerate_dir(Hashmap *top, Hashmap *bottom, const char *path) {
-        DIR *d;
-        int r = 0;
+        _cleanup_closedir_ DIR *d;
 
         assert(top);
         assert(bottom);
@@ -176,15 +165,14 @@ static int enumerate_dir(Hashmap *top, Hashmap *bottom, const char *path) {
         }
 
         for (;;) {
-                struct dirent *de, buf;
+                struct dirent *de;
+                union dirent_storage buf;
                 int k;
                 char *p;
 
-                k = readdir_r(d, &buf, &de);
-                if (k != 0) {
-                        r = -k;
-                        goto finish;
-                }
+                k = readdir_r(d, &buf.de, &de);
+                if (k != 0)
+                        return -k;
 
                 if (!de)
                         break;
@@ -192,46 +180,37 @@ static int enumerate_dir(Hashmap *top, Hashmap *bottom, const char *path) {
                 if (!dirent_is_file(de))
                         continue;
 
-                p = join(path, "/", de->d_name, NULL);
-                if (!p) {
-                        r = -ENOMEM;
-                        goto finish;
-                }
+                p = strjoin(path, "/", de->d_name, NULL);
+                if (!p)
+                        return -ENOMEM;
 
                 path_kill_slashes(p);
 
                 k = hashmap_put(top, path_get_file_name(p), p);
                 if (k >= 0) {
                         p = strdup(p);
-                        if (!p) {
-                                r = -ENOMEM;
-                                goto finish;
-                        }
+                        if (!p)
+                                return -ENOMEM;
                 } else if (k != -EEXIST) {
                         free(p);
-                        r = k;
-                        goto finish;
+                        return k;
                 }
 
                 free(hashmap_remove(bottom, path_get_file_name(p)));
                 k = hashmap_put(bottom, path_get_file_name(p), p);
                 if (k < 0) {
                         free(p);
-                        r = k;
-                        goto finish;
+                        return k;
                 }
         }
 
-finish:
-        closedir(d);
-
-        return r;
+        return 0;
 }
 
 static int process_suffix(const char *prefixes, const char *suffix) {
         const char *p;
         char *f;
-        Hashmap *top, *bottom;
+        Hashmap *top, *bottom=NULL;
         int r = 0, k;
         Iterator i;
         int n_found = 0;
@@ -252,9 +231,9 @@ static int process_suffix(const char *prefixes, const char *suffix) {
         }
 
         NULSTR_FOREACH(p, prefixes) {
-                char *t;
+                _cleanup_free_ char *t = NULL;
 
-                t = join(p, "/", suffix, NULL);
+                t = strjoin(p, "/", suffix, NULL);
                 if (!t) {
                         r = -ENOMEM;
                         goto finish;
@@ -265,7 +244,6 @@ static int process_suffix(const char *prefixes, const char *suffix) {
                         r = k;
 
                 log_debug("Looking at %s", t);
-                free(t);
         }
 
         HASHMAP_FOREACH(f, top, i) {
@@ -307,7 +285,7 @@ static int process_suffix_chop(const char *prefixes, const char *suffix) {
         /* Strip prefix from the suffix */
         NULSTR_FOREACH(p, prefixes) {
                 if (startswith(suffix, p)) {
-                        suffix += strlen(p);;
+                        suffix += strlen(p);
                         suffix += strspn(suffix, "/");
                         return process_suffix(prefixes, suffix);
                 }
@@ -334,17 +312,17 @@ static int parse_flags(const char *flag_str, int flags) {
         size_t l;
 
         FOREACH_WORD(w, l, flag_str, state) {
-                if (strncmp("masked", w, l) == 0)
+                if (strneq("masked", w, l))
                         flags |= SHOW_MASKED;
-                else if (strncmp ("equivalent", w, l) == 0)
+                else if (strneq ("equivalent", w, l))
                         flags |= SHOW_EQUIVALENT;
-                else if (strncmp("redirected", w, l) == 0)
+                else if (strneq("redirected", w, l))
                         flags |= SHOW_REDIRECTED;
-                else if (strncmp("overridden", w, l) == 0)
+                else if (strneq("overridden", w, l))
                         flags |= SHOW_OVERRIDDEN;
-                else if (strncmp("unchanged", w, l) == 0)
+                else if (strneq("unchanged", w, l))
                         flags |= SHOW_UNCHANGED;
-                else if (strncmp("default", w, l) == 0)
+                else if (strneq("default", w, l))
                         flags |= SHOW_DEFAULTS;
                 else
                         return -EINVAL;
@@ -374,7 +352,7 @@ static int parse_argv(int argc, char *argv[]) {
         assert(argc >= 1);
         assert(argv);
 
-        while ((c = getopt_long(argc, argv, "h", options, NULL)) >= 0) {
+        while ((c = getopt_long(argc, argv, "ht:", options, NULL)) >= 0) {
 
                 switch (c) {
 
@@ -384,7 +362,6 @@ static int parse_argv(int argc, char *argv[]) {
 
                 case ARG_VERSION:
                         puts(PACKAGE_STRING);
-                        puts(DISTRIBUTION);
                         puts(SYSTEMD_FEATURES);
                         return 0;
 
@@ -453,8 +430,8 @@ int main(int argc, char *argv[]) {
                 "binfmt.d\0"
                 "systemd/system\0"
                 "systemd/user\0"
-                "systemd/system.preset\0"
-                "systemd/user.preset\0"
+                "systemd/system-preset\0"
+                "systemd/user-preset\0"
                 "udev/rules.d\0"
                 "modprobe.d\0";
 
@@ -477,7 +454,7 @@ int main(int argc, char *argv[]) {
                 arg_flags |= SHOW_OVERRIDDEN;
 
         if (!arg_no_pager)
-                pager_open();
+                pager_open(false);
 
         if (optind < argc) {
                 int i;