| Message ID | 1316206180-6375-5-git-send-email-sandeen@redhat.com |
|---|---|
| State | Accepted, archived |
| Headers | show |
On Fri, Sep 16, 2011 at 03:49:19PM -0500, Eric Sandeen wrote: > 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> Applied, thanks. - Ted -- To unsubscribe from this list: send the line "unsubscribe linux-ext4" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
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);
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> --- misc/mke2fs.c | 7 ++----- 1 files changed, 2 insertions(+), 5 deletions(-)