From patchwork Sat Jun 4 08:19:24 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sergei Trofimovich X-Patchwork-Id: 849212 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by demeter2.kernel.org (8.14.4/8.14.3) with ESMTP id p548VaKM030965 for ; Sat, 4 Jun 2011 08:31:37 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754354Ab1FDIRq (ORCPT ); Sat, 4 Jun 2011 04:17:46 -0400 Received: from smtp.gentoo.org ([140.211.166.183]:38852 "EHLO smtp.gentoo.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754313Ab1FDIRp (ORCPT ); Sat, 4 Jun 2011 04:17:45 -0400 Received: from gentoo.org (unknown [178.125.218.26]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) (Authenticated sender: slyfox) by smtp.gentoo.org (Postfix) with ESMTPSA id 610DF1B402E; Sat, 4 Jun 2011 08:17:43 +0000 (UTC) Received: by gentoo.org (sSMTP sendmail emulation); Sat, 04 Jun 2011 11:20:38 +0300 From: Sergei Trofimovich To: Chris Mason Cc: linux-btrfs@vger.kernel.org, Sergei Trofimovich Subject: [PATCH v2 9/9] mkfs.btrfs: fix error text in '-r' mode Date: Sat, 4 Jun 2011 11:19:24 +0300 Message-Id: <1307175564-25355-10-git-send-email-slyfox@gentoo.org> X-Mailer: git-send-email 1.7.3.4 In-Reply-To: <1307175564-25355-1-git-send-email-slyfox@gentoo.org> References: <1307175564-25355-1-git-send-email-slyfox@gentoo.org> Sender: linux-btrfs-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-btrfs@vger.kernel.org X-Greylist: IP, sender and recipient auto-whitelisted, not delayed by milter-greylist-4.2.6 (demeter2.kernel.org [140.211.167.43]); Sat, 04 Jun 2011 08:31:37 +0000 (UTC) Smart gcc noticed use of uninitialized warning when compiled with -O0 flags: mkfs.c:1291: error: 'file' may be used uninitialized in this function Signed-off-by: Sergei Trofimovich --- mkfs.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/mkfs.c b/mkfs.c index a65fb4d..44a05e8 100644 --- a/mkfs.c +++ b/mkfs.c @@ -1272,47 +1272,47 @@ int main(int ac, char **av) fprintf(stderr, "error checking %s mount status\n", file); exit(1); } if (ret == 1) { fprintf(stderr, "%s is mounted\n", file); exit(1); } ac--; fd = open(file, O_RDWR); if (fd < 0) { fprintf(stderr, "unable to open %s\n", file); exit(1); } first_fd = fd; first_file = file; ret = btrfs_prepare_device(fd, file, zero_end, &dev_block_count, &mixed); if (block_count == 0) block_count = dev_block_count; } else { ac = 0; + file = output; fd = open_target(output); if (fd < 0) { fprintf(stderr, "unable to open the %s\n", file); exit(1); } - file = output; first_fd = fd; first_file = file; block_count = size_sourcedir(source_dir, sectorsize, &num_of_meta_chunks, &size_of_data); ret = zero_output_file(fd, block_count, sectorsize); if (ret) { fprintf(stderr, "unable to zero the output file\n"); exit(1); } } if (mixed) { if (!metadata_profile_opt) metadata_profile = 0; if (!data_profile_opt) data_profile = 0; if (metadata_profile != data_profile) { fprintf(stderr, "With mixed block groups data and metadata " "profiles must be the same\n"); exit(1);