]> Sergey Matveev's repositories - nnn.git/commitdiff
More redundant check removal
authorArun Prakash Jana <engineerarun@gmail.com>
Sat, 27 Oct 2018 18:50:39 +0000 (00:20 +0530)
committerArun Prakash Jana <engineerarun@gmail.com>
Sat, 27 Oct 2018 18:50:39 +0000 (00:20 +0530)
nnn.c

diff --git a/nnn.c b/nnn.c
index 0aa375a66d35ef140762fe37d85464ea505d66d7..52176370c618c9da714b6de02e79ee509db68dbc 100644 (file)
--- a/nnn.c
+++ b/nnn.c
@@ -460,7 +460,7 @@ static void *xrealloc(void *pcur, size_t len)
        static void *pmem;
 
        pmem = realloc(pcur, len);
-       if (!pmem && pcur)
+       if (!pmem)
                free(pcur);
 
        return pmem;
@@ -2081,6 +2081,12 @@ static int sum_sizes(const char *fpath, const struct stat *sb,
        return 0;
 }
 
+static void dentfree(struct entry *dents)
+{
+       free(pnamebuf);
+       free(dents);
+}
+
 static int dentfill(char *path, struct entry **dents,
         int (*filter)(regex_t *, char *), regex_t *re)
 {
@@ -2238,22 +2244,13 @@ static int dentfill(char *path, struct entry **dents,
 
        /* Should never be null */
        if (closedir(dirp) == -1) {
-               if (*dents) {
-                       free(pnamebuf);
-                       free(*dents);
-               }
+               dentfree(*dents);
                errexit();
        }
 
        return n;
 }
 
-static void dentfree(struct entry *dents)
-{
-       free(pnamebuf);
-       free(dents);
-}
-
 /* Return the position of the matching entry or 0 otherwise */
 static int dentfind(struct entry *dents, const char *fname, int n)
 {
@@ -2887,8 +2884,7 @@ nochange:
                        mkpath(path, dents[cur].name, newpath, PATH_MAX);
 
                        if (lstat(newpath, &sb) == -1) {
-                               if (dents)
-                                       dentfree(dents);
+                               dentfree(dents);
                                errexit();
                        }