undef/git-commit-vandalism
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

builtin-remote: make rm() use properly named variable to hold return value

Browse Source 
"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>
This commit is contained in:
Jay Soffian 2009-02-03 12:51:12 -05:00 committed by Junio C Hamano
parent bc395643b6
commit e02f1762b2
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
builtin-remote.c
View File

@ -356,7 +356,7 @@ static int rm(int argc, const char **argv)
struct known_remotes known_remotes = { NULL, NULL }; struct known_remotes known_remotes = { NULL, NULL };
struct string_list branches = { NULL, 0, 0, 1 }; struct string_list branches = { NULL, 0, 0, 1 };
struct branches_for_remote cb_data = { NULL, &branches, &known_remotes }; struct branches_for_remote cb_data = { NULL, &branches, &known_remotes };
int i; int i, result;
if (argc != 2) if (argc != 2)
usage_with_options(builtin_remote_usage, options); usage_with_options(builtin_remote_usage, options);
@ -397,14 +397,14 @@ static int rm(int argc, const char **argv)
* refs, which are invalidated when deleting a branch. * refs, which are invalidated when deleting a branch.
*/ */
cb_data.remote = remote; 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); strbuf_release(&buf);
if (!i) if (!result)
i = remove_branches(&branches); result = remove_branches(&branches);
string_list_clear(&branches, 1); string_list_clear(&branches, 1);
return i; return result;
} }
static void show_list(const char *title, struct string_list *list, static void show_list(const char *title, struct string_list *list,