From: Sami Kerola <kerolasa@iki.fi>
Date: Mon, 8 Apr 2013 19:32:51 +0000 (+0100)
Subject: libmount, col: remove redundant null checks [smatch scan]
X-Git-Tag: v2.23-rc2~30
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=9e01635e326c787059e5c1b83b5fbb9dddd67275;p=thirdparty%2Futil-linux.git

libmount, col: remove redundant null checks [smatch scan]

libmount/src/context_umount.c:174 mnt_context_find_umount_fs() info: redundant null check on loopdev calling free()
libmount/src/context_umount.c:179 mnt_context_find_umount_fs() info: redundant null check on loopdev calling free()
text-utils/col.c:406 flush_lines() info: redundant null check on l->l_line calling free()

Signed-off-by: Sami Kerola <kerolasa@iki.fi>
---

diff --git a/libmount/src/context_umount.c b/libmount/src/context_umount.c
index 96ae87ae16..b9484594bf 100644
--- a/libmount/src/context_umount.c
+++ b/libmount/src/context_umount.c
@@ -170,13 +170,11 @@ try_loopdev:
 	}
 
 	*pfs = fs;
-	if (loopdev)
-		free(loopdev);
+	free(loopdev);
 
 	return fs ? 0 : 1;
 err:
-	if (loopdev)
-		free(loopdev);
+	free(loopdev);
 	return rc;
 }
 
diff --git a/text-utils/col.c b/text-utils/col.c
index 474b33fca3..9aa6a414b3 100644
--- a/text-utils/col.c
+++ b/text-utils/col.c
@@ -402,8 +402,7 @@ void flush_lines(int nflush)
 			flush_line(l);
 		}
 		nblank_lines++;
-		if (l->l_line)
-			free((void *)l->l_line);
+		free((void *)l->l_line);
 		free_line(l);
 	}
 	if (lines)