From mboxrd@z Thu Jan 1 00:00:00 1970 From: Michael Haggerty Subject: [PATCH v3 15/23] git-check-attr: Introduce a new variable Date: Thu, 4 Aug 2011 06:36:25 +0200 Message-ID: <1312432593-9841-16-git-send-email-mhagger@alum.mit.edu> References: <1312432593-9841-1-git-send-email-mhagger@alum.mit.edu> Cc: gitster@pobox.com, Michael Haggerty To: git@vger.kernel.org X-From: git-owner@vger.kernel.org Thu Aug 04 06:37:47 2011 Return-path: Envelope-to: gcvg-git-2@lo.gmane.org Received: from vger.kernel.org ([209.132.180.67]) by lo.gmane.org with esmtp (Exim 4.69) (envelope-from ) id 1Qopgo-0005WA-KY for gcvg-git-2@lo.gmane.org; Thu, 04 Aug 2011 06:37:47 +0200 Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751765Ab1HDEh0 (ORCPT ); Thu, 4 Aug 2011 00:37:26 -0400 Received: from einhorn.in-berlin.de ([192.109.42.8]:39668 "EHLO einhorn.in-berlin.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751346Ab1HDEhE (ORCPT ); Thu, 4 Aug 2011 00:37:04 -0400 X-Envelope-From: mhagger@alum.mit.edu Received: from michael.fritz.box (p54BEB339.dip.t-dialin.net [84.190.179.57]) by einhorn.in-berlin.de (8.13.6/8.13.6/Debian-1) with ESMTP id p744agHt029203; Thu, 4 Aug 2011 06:37:01 +0200 X-Mailer: git-send-email 1.7.6.8.gd2879 In-Reply-To: <1312432593-9841-1-git-send-email-mhagger@alum.mit.edu> X-Scanned-By: MIMEDefang_at_IN-Berlin_e.V. on 192.109.42.8 Sender: git-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org Archived-At: Avoid reusing variable "doubledash" to mean something other than the expected "position of a double-dash, if any". Signed-off-by: Michael Haggerty --- builtin/check-attr.c | 13 +++++++------ 1 files changed, 7 insertions(+), 6 deletions(-) diff --git a/builtin/check-attr.c b/builtin/check-attr.c index 384c5a6..c527078 100644 --- a/builtin/check-attr.c +++ b/builtin/check-attr.c @@ -71,7 +71,7 @@ static void check_attr_stdin_paths(int cnt, struct git_attr_check *check) int cmd_check_attr(int argc, const char **argv, const char *prefix) { struct git_attr_check *check; - int cnt, i, doubledash; + int cnt, i, doubledash, filei; const char *errstr = NULL; argc = parse_options(argc, argv, prefix, check_attr_options, @@ -92,14 +92,15 @@ int cmd_check_attr(int argc, const char **argv, const char *prefix) /* If there is no double dash, we handle only one attribute */ if (doubledash < 0) { cnt = 1; - doubledash = 0; - } else + filei = 1; + } else { cnt = doubledash; - doubledash++; + filei = doubledash + 1; + } if (cnt <= 0) errstr = "No attribute specified"; - else if (stdin_paths && doubledash < argc) + else if (stdin_paths && filei < argc) errstr = "Can't specify files with --stdin"; if (errstr) { error("%s", errstr); @@ -120,7 +121,7 @@ int cmd_check_attr(int argc, const char **argv, const char *prefix) if (stdin_paths) check_attr_stdin_paths(cnt, check); else { - for (i = doubledash; i < argc; i++) + for (i = filei; i < argc; i++) check_attr(cnt, check, argv[i]); maybe_flush_or_die(stdout, "attribute to stdout"); } -- 1.7.6.8.gd2879