Skip to content

Commit

Permalink
builtin-remote: make rm() use properly named variable to hold return …
Browse files Browse the repository at this point in the history
…value

"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 <jaysoffian@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
  • Loading branch information
Jay Soffian authored and Junio C Hamano committed Feb 4, 2009
1 parent bc39564 commit e02f176
Showing 1 changed file with 5 additions and 5 deletions.
10 changes: 5 additions & 5 deletions builtin-remote.c
Original file line number Diff line number Diff line change
Expand Up @@ -356,7 +356,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);
Expand Down Expand Up @@ -397,14 +397,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,
Expand Down

0 comments on commit e02f176

Please sign in to comment.