From patchwork Fri Sep 16 20:49:19 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Eric Sandeen X-Patchwork-Id: 115033 Return-Path: X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 3A9EEB7182 for ; Sat, 17 Sep 2011 06:49:50 +1000 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755615Ab1IPUtp (ORCPT ); Fri, 16 Sep 2011 16:49:45 -0400 Received: from sandeen.net ([63.231.237.45]:46728 "EHLO mail.sandeen.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755313Ab1IPUto (ORCPT ); Fri, 16 Sep 2011 16:49:44 -0400 Received: by mail.sandeen.net (Postfix, from userid 500) id BC4E14A8BA72; Fri, 16 Sep 2011 15:49:43 -0500 (CDT) From: Eric Sandeen To: linux-ext4@vger.kernel.org Cc: Eric Sandeen Subject: [PATCH 04/25] mke2fs: remove impossible tests for null usage_types Date: Fri, 16 Sep 2011 15:49:19 -0500 Message-Id: <1316206180-6375-5-git-send-email-sandeen@redhat.com> X-Mailer: git-send-email 1.7.4.1 In-Reply-To: <1316206180-6375-1-git-send-email-sandeen@redhat.com> References: <1316206180-6375-1-git-send-email-sandeen@redhat.com> Sender: linux-ext4-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-ext4@vger.kernel.org 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 --- misc/mke2fs.c | 7 ++----- 1 files 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);