From: Jay Soffian Date: Tue, 03 Feb 2009 17:51:12 GMT Subject: [PATCH 1/2] builtin-remote: make rm() use properly named variable to hold return value Message-ID: <1233683473-87893-1-git-send-email-jaysoffian@gmail.com> In-Reply-To: <76718490902030638y36299191i1fcc2ab8646b9593@mail.gmail.com> "i" is a loop counter and should not be used to hold a return value; use "result" instead which is consistent with the rest of builtin-remote.c. Signed-off-by: Jay Soffian --- I'm not sure this minor change needed to be broken out into its own commit, so squash with 2/2 if that's appropriate. builtin-remote.c | 10 +++++----- 1 files changed, 5 insertions(+), 5 deletions(-) diff --git a/builtin-remote.c b/builtin-remote.c index abc8dd8..21885fb 100644 --- a/builtin-remote.c +++ b/builtin-remote.c @@ -543,7 +543,7 @@ static int rm(int argc, const char **argv) struct known_remotes known_remotes = { NULL, NULL }; struct string_list branches = { NULL, 0, 0, 1 }; struct branches_for_remote cb_data = { NULL, &branches, &known_remotes }; - int i; + int i, result; if (argc != 2) usage_with_options(builtin_remote_usage, options); @@ -583,14 +583,14 @@ static int rm(int argc, const char **argv) * refs, which are invalidated when deleting a branch. */ cb_data.remote = remote; - i = for_each_ref(add_branch_for_removal, &cb_data); + result = for_each_ref(add_branch_for_removal, &cb_data); strbuf_release(&buf); - if (!i) - i = remove_branches(&branches); + if (!result) + result = remove_branches(&branches); string_list_clear(&branches, 1); - return i; + return result; } static void show_list(const char *title, struct string_list *list, -- 1.6.1.2.311.g2d7f3