From: Michael Haggerty <mhagger@alum.mit.edu>
To: git@vger.kernel.org
Cc: gitster@pobox.com, Michael Haggerty <mhagger@alum.mit.edu>
Subject: [PATCH 11/19] git-check-attr: Introduce a new variable
Date: Tue, 26 Jul 2011 16:12:54 +0200 [thread overview]
Message-ID: <1311689582-3116-12-git-send-email-mhagger@alum.mit.edu> (raw)
In-Reply-To: <1311689582-3116-1-git-send-email-mhagger@alum.mit.edu>
Avoid reusing variable "doubledash" to mean something other than the
expected "position of a double-dash, if any".
Signed-off-by: Michael Haggerty <mhagger@alum.mit.edu>
---
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
next prev parent reply other threads:[~2011-07-26 14:33 UTC|newest]
Thread overview: 24+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-07-26 14:12 [PATCH 00/19] Add --all option to git-check-attr Michael Haggerty
2011-07-26 14:12 ` [PATCH 01/19] doc: Add a link from gitattributes(5) to git-check-attr(1) Michael Haggerty
2011-07-26 14:12 ` [PATCH 02/19] doc: Correct git_attr() calls in example code Michael Haggerty
2011-07-26 14:12 ` [PATCH 03/19] Remove anachronism from comment Michael Haggerty
2011-07-26 14:12 ` [PATCH 04/19] Disallow the empty string as an attribute name Michael Haggerty
2011-07-27 20:20 ` Junio C Hamano
2011-07-26 14:12 ` [PATCH 05/19] git-check-attr: Add missing "&&" Michael Haggerty
2011-07-26 14:12 ` [PATCH 06/19] git-check-attr: Add tests of command-line parsing Michael Haggerty
2011-07-26 14:12 ` [PATCH 07/19] Provide access to the name attribute of git_attr Michael Haggerty
2011-07-27 20:02 ` Junio C Hamano
2011-07-28 4:27 ` Michael Haggerty
2011-07-26 14:12 ` [PATCH 08/19] git-check-attr: Use git_attr_name() Michael Haggerty
2011-07-26 14:12 ` [PATCH 09/19] Allow querying all attributes on a file Michael Haggerty
2011-07-26 14:12 ` [PATCH 10/19] git-check-attr: Extract a function output_attr() Michael Haggerty
2011-07-26 14:12 ` Michael Haggerty [this message]
2011-07-26 14:12 ` [PATCH 12/19] git-check-attr: Extract a function error_with_usage() Michael Haggerty
2011-07-26 14:12 ` [PATCH 13/19] git-check-attr: Handle each error separately Michael Haggerty
2011-07-26 14:12 ` [PATCH 14/19] git-check-attr: Process command-line args more systematically Michael Haggerty
2011-07-26 14:12 ` [PATCH 15/19] git-check-attr: Error out if no pathnames are specified Michael Haggerty
2011-07-26 14:12 ` [PATCH 16/19] git-check-attr: Add an --all option to show all attributes Michael Haggerty
2011-07-28 4:31 ` Michael Haggerty
2011-07-26 14:13 ` [PATCH 17/19] git-check-attr: Drive two tests using the same raw data Michael Haggerty
2011-07-26 14:13 ` [PATCH 18/19] git-check-attr: Fix command-line handling to match docs Michael Haggerty
2011-07-26 14:13 ` [PATCH 19/19] Rename struct git_attr_check to git_attr_value Michael Haggerty
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1311689582-3116-12-git-send-email-mhagger@alum.mit.edu \
--to=mhagger@alum.mit.edu \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).