From 4d5cf8b166bb29f0e3280bbadca9d3a8b895acd1 Mon Sep 17 00:00:00 2001 From: Eric Sandeen Date: Fri, 16 Sep 2011 15:49:19 -0500 Subject: [PATCH] mke2fs: remove impossible tests for null usage_types parse_fs_type explicitly sets usage_types if it is null, so there is no need to test for null later. Signed-off-by: Eric Sandeen Signed-off-by: Theodore Ts'o --- misc/mke2fs.c | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/misc/mke2fs.c b/misc/mke2fs.c index abcfbf0..437b495 100644 --- a/misc/mke2fs.c +++ b/misc/mke2fs.c @@ -1029,15 +1029,12 @@ static char **parse_fs_type(const char *fs_type, if (!usage_types) usage_types = size_type; - parse_str = malloc(usage_types ? strlen(usage_types)+1 : 1); + parse_str = malloc(strlen(usage_types)+1); if (!parse_str) { free(list.list); return 0; } - if (usage_types) - strcpy(parse_str, usage_types); - else - *parse_str = '\0'; + strcpy(parse_str, usage_types); if (ext_type) push_string(&list, ext_type); -- 1.8.3.1