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

Fix two unused variable warnings in gcc 4.6

Browse Source 
Seen with -Wunused-but-set-variable.

Signed-off-by: Dan McGee <dpmcgee@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Dan McGee 2011-03-27 20:32:19 -05:00 committed by Junio C Hamano
parent 37be802240
commit 13ee1384ef
2 changed files with 1 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
http-fetch.c
View File

@ -8,7 +8,6 @@ static const char http_fetch_usage[] = "git http-fetch "
int main(int argc, const char **argv) int main(int argc, const char **argv)
{ {
const char *prefix;
struct walker *walker; struct walker *walker;
int commits_on_stdin = 0; int commits_on_stdin = 0;
int commits; int commits;
@ -60,7 +59,7 @@ int main(int argc, const char **argv)
if (argv[arg]) if (argv[arg])
str_end_url_with_slash(argv[arg], &url); str_end_url_with_slash(argv[arg], &url);
prefix = setup_git_directory(); setup_git_directory();
git_config(git_default_config, NULL); git_config(git_default_config, NULL);

4
merge-recursive.c
View File

@ -356,7 +356,6 @@ static void make_room_for_directories_of_df_conflicts(struct merge_options *o,
*/ */
const char *last_file = NULL; const char *last_file = NULL;
int last_len = 0; int last_len = 0;
struct stage_data *last_e;
int i; int i;
for (i = 0; i < entries->nr; i++) { for (i = 0; i < entries->nr; i++) {
@ -386,7 +385,6 @@ static void make_room_for_directories_of_df_conflicts(struct merge_options *o,
if (S_ISREG(e->stages[2].mode) || S_ISLNK(e->stages[2].mode)) { if (S_ISREG(e->stages[2].mode) || S_ISLNK(e->stages[2].mode)) {
last_file = path; last_file = path;
last_len = len; last_len = len;
last_e = e;
} else { } else {
last_file = NULL; last_file = NULL;
} }
@ -961,7 +959,6 @@ static int process_renames(struct merge_options *o,
} }
for (i = 0, j = 0; i < a_renames->nr || j < b_renames->nr;) { for (i = 0, j = 0; i < a_renames->nr || j < b_renames->nr;) {
char *src;
struct string_list *renames1, *renames2Dst; struct string_list *renames1, *renames2Dst;
struct rename *ren1 = NULL, *ren2 = NULL; struct rename *ren1 = NULL, *ren2 = NULL;
const char *branch1, *branch2; const char *branch1, *branch2;
@ -996,7 +993,6 @@ static int process_renames(struct merge_options *o,
ren2 = ren1; ren2 = ren1;
ren1 = tmp; ren1 = tmp;
} }
src = ren1->pair->one->path;
ren1->dst_entry->processed = 1; ren1->dst_entry->processed = 1;
ren1->src_entry->processed = 1; ren1->src_entry->processed = 1;