diff options
author | Jim Meyering <jim@meyering.net> | 2009-02-23 18:07:50 +0100 |
---|---|---|
committer | Theodore Ts'o <tytso@mit.edu> | 2009-03-08 20:37:12 -0400 |
commit | 45e338f5332a54295893dba2e32cc093d1316f60 (patch) | |
tree | f20a569662c01e9330b33ea9fd8baa83c7601473 /misc/fsck.c | |
parent | a6d4aa147415acf875300176c5ca98ca72594bec (diff) | |
download | e2fsprogs-45e338f5332a54295893dba2e32cc093d1316f60.tar.gz |
remove useless if-before-free tests
In case you're wondering about whether this change is safe from a
portability standpoint, fear not. This has been beaten to death
in other forums. Here are a few threads:
http://thread.gmane.org/gmane.comp.version-control.git/74187
http://thread.gmane.org/gmane.comp.lib.gnulib.bugs/12712
http://thread.gmane.org/gmane.emacs.devel/98144
http://thread.gmane.org/gmane.comp.lib.glibc.alpha/13092
There has been debate about whether it's a good idea from a
performance standpoint, too, but imho you'll have a hard time
finding an instance where this sort of change induces a
measurable performance penalty. If you do, please let me know.
Signed-off-by: Jim Meyering <meyering@redhat.com>
Signed-off-by: Theodore Ts'o <tytso@mit.edu>
Diffstat (limited to 'misc/fsck.c')
-rw-r--r-- | misc/fsck.c | 12 |
1 files changed, 4 insertions, 8 deletions
diff --git a/misc/fsck.c b/misc/fsck.c index ea8f0e2d..fe9426e0 100644 --- a/misc/fsck.c +++ b/misc/fsck.c @@ -233,12 +233,9 @@ static void parse_escape(char *word) static void free_instance(struct fsck_instance *i) { - if (i->prog) - free(i->prog); - if (i->device) - free(i->device); - if (i->base_device) - free(i->base_device); + free(i->prog); + free(i->device); + free(i->base_device); free(i); return; } @@ -310,8 +307,7 @@ static int parse_fstab_line(char *line, struct fs_info **ret_fs) fs = create_fs_device(device, mntpnt, type ? type : "auto", opts, freq ? atoi(freq) : -1, passno ? atoi(passno) : -1); - if (dev) - free(dev); + free(dev); if (!fs) return -1; |