losetup, agetty: remove unnecessary if's before free()

Reference: http://git.savannah.gnu.org/cgit/gnulib.git/tree/build-aux/useless-if-before-free
Signed-off-by: Sami Kerola <kerolasa@iki.fi>

diff --git a/sys-utils/losetup.c b/sys-utils/losetup.c
index 5be3288485230fad0763e3c98e5804c73964299f..70d9155c0f822773a1a6e12c44722a138ce71de3 100644 (file)
--- a/sys-utils/losetup.c
+++ b/sys-utils/losetup.c
@@ -184,8 +184,7 @@ static int show_all_loops(struct loopdev_cxt *lc, const char *file,
                printf_loopdev(lc);
        }
        loopcxt_deinit_iterator(lc);
-       if (cn_file)
-               free(cn_file);
+       free(cn_file);
        return 0;
 }
 
@@ -351,8 +350,7 @@ static int make_table(struct loopdev_cxt *lc,
        }
 
        loopcxt_deinit_iterator(lc);
-       if (cn_file)
-               free(cn_file);
+       free(cn_file);
        return 0;
 }
 

diff --git a/term-utils/agetty.c b/term-utils/agetty.c
index 113f8e79dfac36fcb2b697b08e0c76280464be48..b162e9f75aa847bb46580ae6de533090cf93aa93 100644 (file)
--- a/term-utils/agetty.c
+++ b/term-utils/agetty.c
@@ -466,8 +466,7 @@ int main(int argc, char **argv)
                        log_warn(_("%s: can't change process priority: %m"),
                                options.tty);
        }
-       if (options.osrelease)
-               free(options.osrelease);
+       free(options.osrelease);
 #ifdef DEBUGGING
        fprintf(dbf, "read %c\n", ch);
        if (close_stream(dbf) != 0)
@@ -1383,8 +1382,7 @@ static char *read_os_release(struct options *op, const char *varname)
                        }
                        break;
                }
-               if (ret)
-                       free(ret);
+               free(ret);
                ret = strdup(p);
                if (!ret)
                        log_err(_("failed to allocate memory: %m"));