From mboxrd@z Thu Jan 1 00:00:00 1970 From: Jacob Keller Subject: [PATCH 1/2] tag: use skip_prefix instead of magic numbers Date: Thu, 10 Jul 2014 16:52:13 -0700 Message-ID: <1405036334-8093-1-git-send-email-jacob.e.keller@intel.com> Cc: Jacob Keller To: git@vger.kernel.org X-From: git-owner@vger.kernel.org Fri Jul 11 01:52:30 2014 Return-path: Envelope-to: gcvg-git-2@plane.gmane.org Received: from vger.kernel.org ([209.132.180.67]) by plane.gmane.org with esmtp (Exim 4.69) (envelope-from ) id 1X5O8c-0003XZ-5w for gcvg-git-2@plane.gmane.org; Fri, 11 Jul 2014 01:52:30 +0200 Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751174AbaGJXwX (ORCPT ); Thu, 10 Jul 2014 19:52:23 -0400 Received: from mga01.intel.com ([192.55.52.88]:33133 "EHLO mga01.intel.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751011AbaGJXwW (ORCPT ); Thu, 10 Jul 2014 19:52:22 -0400 Received: from fmsmga002.fm.intel.com ([10.253.24.26]) by fmsmga101.fm.intel.com with ESMTP; 10 Jul 2014 16:52:15 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.01,640,1400050800"; d="scan'208";a="568199078" Received: from jekeller-desk1.jf.intel.com (HELO jekeller-desk1.amr.corp.intel.com) ([134.134.173.156]) by fmsmga002.fm.intel.com with ESMTP; 10 Jul 2014 16:52:15 -0700 X-Mailer: git-send-email 2.0.1.475.g9b8d714 Sender: git-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org Archived-At: Make the parsing of the --sort parameter more readable by having skip_prefix keep our pointer up to date. Authored-by: Jeff King Signed-off-by: Jacob Keller --- builtin/tag.c | 14 ++++---------- 1 file changed, 4 insertions(+), 10 deletions(-) diff --git a/builtin/tag.c b/builtin/tag.c index ef765563388c..7ccb6f3c581b 100644 --- a/builtin/tag.c +++ b/builtin/tag.c @@ -524,18 +524,12 @@ static int parse_opt_sort(const struct option *opt, const char *arg, int unset) int *sort = opt->value; int flags = 0; - if (*arg == '-') { + if (skip_prefix(arg, "-", &arg)) flags |= REVERSE_SORT; - arg++; - } - if (starts_with(arg, "version:")) { + + if (skip_prefix(arg, "version:", &arg) || skip_prefix(arg, "v:", &arg)) *sort = VERCMP_SORT; - arg += 8; - } else if (starts_with(arg, "v:")) { - *sort = VERCMP_SORT; - arg += 2; - } else - *sort = STRCMP_SORT; + if (strcmp(arg, "refname")) die(_("unsupported sort specification %s"), arg); *sort |= flags; -- 2.0.1.475.g9b8d714