Whamcloud - gitweb
mke2fs: remove impossible tests for null usage_types
authorEric Sandeen <sandeen@redhat.com>
Fri, 16 Sep 2011 20:49:19 +0000 (15:49 -0500)
committerTheodore Ts'o <tytso@mit.edu>
Fri, 16 Sep 2011 22:43:04 +0000 (18:43 -0400)
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 <sandeen@redhat.com>
Signed-off-by: Theodore Ts'o <tytso@mit.edu>
misc/mke2fs.c

index abcfbf0..437b495 100644 (file)
@@ -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);