From patchwork Tue Oct 13 15:42:20 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: David Sterba X-Patchwork-Id: 7386411 Return-Path: X-Original-To: patchwork-linux-btrfs@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork1.web.kernel.org (Postfix) with ESMTP id 6E5C09F302 for ; Tue, 13 Oct 2015 15:48:15 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 8CC2420749 for ; Tue, 13 Oct 2015 15:48:14 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 8BFA520748 for ; Tue, 13 Oct 2015 15:48:13 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932524AbbJMPsG (ORCPT ); Tue, 13 Oct 2015 11:48:06 -0400 Received: from mx2.suse.de ([195.135.220.15]:38517 "EHLO mx2.suse.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752702AbbJMPna (ORCPT ); Tue, 13 Oct 2015 11:43:30 -0400 X-Virus-Scanned: by amavisd-new at test-mx.suse.de Received: from relay2.suse.de (charybdis-ext.suse.de [195.135.220.254]) by mx2.suse.de (Postfix) with ESMTP id 27750ABCC for ; Tue, 13 Oct 2015 15:43:28 +0000 (UTC) Received: by ds.suse.cz (Postfix, from userid 10065) id 47EACDAB57; Tue, 13 Oct 2015 17:42:20 +0200 (CEST) From: David Sterba To: linux-btrfs@vger.kernel.org Cc: David Sterba Subject: [PATCH 1/7] btrfs-progs: cleanup and comment parse_range Date: Tue, 13 Oct 2015 17:42:20 +0200 Message-Id: <4d4646c4a4938b58e4c5bd0ab57361b0261d202b.1444750808.git.dsterba@suse.com> X-Mailer: git-send-email 2.6.1 In-Reply-To: References: Sender: linux-btrfs-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-btrfs@vger.kernel.org X-Spam-Status: No, score=-6.9 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_HI, T_RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=unavailable version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP Simplify a check and unindent some code. Signed-off-by: David Sterba --- cmds-balance.c | 63 ++++++++++++++++++++++++++++++++++------------------------ 1 file changed, 37 insertions(+), 26 deletions(-) diff --git a/cmds-balance.c b/cmds-balance.c index 9af218bbfa51..798b533aa7d6 100644 --- a/cmds-balance.c +++ b/cmds-balance.c @@ -88,43 +88,54 @@ static int parse_u64(const char *str, u64 *result) return 0; } +/* + * Parse range that's missing some part that can be implicit: + * a..b - exact range, a can be equal to b + * a.. - implicitly unbounded maximum (end == (u64)-1) + * ..b - implicitly starting at 0 + * a - invalid; unclear semantics, use parse_u64 instead + * + * Returned values are u64, value validation and interpretation should be done + * by the caller. + */ static int parse_range(const char *range, u64 *start, u64 *end) { char *dots; + const char *rest; + int skipped = 0; dots = strstr(range, ".."); - if (dots) { - const char *rest = dots + 2; - int skipped = 0; - - *dots = 0; + if (!dots) + return 1; - if (!*rest) { - *end = (u64)-1; - skipped++; - } else { - if (parse_u64(rest, end)) - return 1; - } - if (dots == range) { - *start = 0; - skipped++; - } else { - if (parse_u64(range, start)) - return 1; - } + rest = dots + 2; + *dots = 0; - if (*start >= *end) { - fprintf(stderr, "Range %llu..%llu doesn't make " - "sense\n", (unsigned long long)*start, - (unsigned long long)*end); + if (!*rest) { + *end = (u64)-1; + skipped++; + } else { + if (parse_u64(rest, end)) return 1; - } + } + if (dots == range) { + *start = 0; + skipped++; + } else { + if (parse_u64(range, start)) + return 1; + } - if (skipped <= 1) - return 0; + if (*start >= *end) { + fprintf(stderr, "Range %llu..%llu doesn't make " + "sense\n", (unsigned long long)*start, + (unsigned long long)*end); + return 1; } + if (skipped <= 1) + return 0; + return 1; }