{"thread":{"id":"26883","subject":"[PATCH] Fix two unused variable warnings in gcc 4.6","startedAt":"2011-03-28T01:32:19Z","lastAt":"2011-03-28T13:57:54Z","messageCount":3,"participants":["Dan McGee","Joshua Juran"],"isPatch":true,"patchVersion":1,"patchTotal":null},"messages":[{"id":"164402","messageId":"1301275939-17018-1-git-send-email-dpmcgee@gmail.com","threadId":"26883","inReplyTo":null,"subject":"[PATCH] Fix two unused variable warnings in gcc 4.6","fromName":"Dan McGee","fromEmail":"dpmcgee@gmail.com","sentAt":"2011-03-28T01:32:19Z","receivedAt":"2011-03-28T01:32:19Z","isPatch":true,"sender":{"key":"dpmcgee@gmail.com","avatar":"https://avatars.githubusercontent.com/u/265817?v=4"},"body":"Seen with -Wunused-but-set-variable.\n\nSigned-off-by: Dan McGee <dpmcgee@gmail.com>\n---\n http-fetch.c      |    3 +--\n merge-recursive.c |    4 ----\n 2 files changed, 1 insertions(+), 6 deletions(-)\n\ndiff --git a/http-fetch.c b/http-fetch.c\nindex 923904f..3af4c71 100644\n--- a/http-fetch.c\n+++ b/http-fetch.c\n@@ -8,7 +8,6 @@ static const char http_fetch_usage[] = \"git http-fetch \"\n \n int main(int argc, const char **argv)\n {\n-\tconst char *prefix;\n \tstruct walker *walker;\n \tint commits_on_stdin = 0;\n \tint commits;\n@@ -60,7 +59,7 @@ int main(int argc, const char **argv)\n \tif (argv[arg])\n \t\tstr_end_url_with_slash(argv[arg], &url);\n \n-\tprefix = setup_git_directory();\n+\tsetup_git_directory();\n \n \tgit_config(git_default_config, NULL);\n \ndiff --git a/merge-recursive.c b/merge-recursive.c\nindex 8e82a8b..af13150 100644\n--- a/merge-recursive.c\n+++ b/merge-recursive.c\n@@ -356,7 +356,6 @@ static void make_room_for_directories_of_df_conflicts(struct merge_options *o,\n \t */\n \tconst char *last_file = NULL;\n \tint last_len = 0;\n-\tstruct stage_data *last_e;\n \tint i;\n \n \tfor (i = 0; i < entries->nr; i++) {\n@@ -386,7 +385,6 @@ static void make_room_for_directories_of_df_conflicts(struct merge_options *o,\n \t\tif (S_ISREG(e->stages[2].mode) || S_ISLNK(e->stages[2].mode)) {\n \t\t\tlast_file = path;\n \t\t\tlast_len = len;\n-\t\t\tlast_e = e;\n \t\t} else {\n \t\t\tlast_file = NULL;\n \t\t}\n@@ -961,7 +959,6 @@ static int process_renames(struct merge_options *o,\n \t}\n \n \tfor (i = 0, j = 0; i < a_renames->nr || j < b_renames->nr;) {\n-\t\tchar *src;\n \t\tstruct string_list *renames1, *renames2Dst;\n \t\tstruct rename *ren1 = NULL, *ren2 = NULL;\n \t\tconst char *branch1, *branch2;\n@@ -996,7 +993,6 @@ static int process_renames(struct merge_options *o,\n \t\t\tren2 = ren1;\n \t\t\tren1 = tmp;\n \t\t}\n-\t\tsrc = ren1->pair->one->path;\n \n \t\tren1->dst_entry->processed = 1;\n \t\tren1->src_entry->processed = 1;\n-- \n1.7.4.1\n"},{"id":"164429","messageId":"92140045-86C2-4525-A867-7654D3FE53FB@gmail.com","threadId":"26883","inReplyTo":"1301275939-17018-1-git-send-email-dpmcgee@gmail.com","subject":"Re: [PATCH] Fix two unused variable warnings in gcc 4.6","fromName":"Joshua Juran","fromEmail":"jjuran@gmail.com","sentAt":"2011-03-28T13:05:51Z","receivedAt":"2011-03-28T13:05:51Z","isPatch":true,"sender":{"key":"jjuran@gmail.com","avatar":null},"body":"On Mar 27, 2011, at 6:32 PM, Dan McGee wrote:\n\n> diff --git a/http-fetch.c b/http-fetch.c\n> index 923904f..3af4c71 100644\n> --- a/http-fetch.c\n> +++ b/http-fetch.c\n> @@ -8,7 +8,6 @@ static const char http_fetch_usage[] = \"git http- \n> fetch \"\n>\n> int main(int argc, const char **argv)\n> {\n> -\tconst char *prefix;\n> \tstruct walker *walker;\n> \tint commits_on_stdin = 0;\n> \tint commits;\n> diff --git a/merge-recursive.c b/merge-recursive.c\n> index 8e82a8b..af13150 100644\n> --- a/merge-recursive.c\n> +++ b/merge-recursive.c\n> @@ -356,7 +356,6 @@ static void  \n> make_room_for_directories_of_df_conflicts(struct merge_options *o,\n> \t */\n> \tconst char *last_file = NULL;\n> \tint last_len = 0;\n> -\tstruct stage_data *last_e;\n> \tint i;\n>\n> \tfor (i = 0; i < entries->nr; i++) {\n> @@ -961,7 +959,6 @@ static int process_renames(struct merge_options  \n> *o,\n> \t}\n>\n> \tfor (i = 0, j = 0; i < a_renames->nr || j < b_renames->nr;) {\n> -\t\tchar *src;\n> \t\tstruct string_list *renames1, *renames2Dst;\n> \t\tstruct rename *ren1 = NULL, *ren2 = NULL;\n> \t\tconst char *branch1, *branch2;\n\nLooks like three unused variables, not two.\n\nJosh\n"},{"id":"164433","messageId":"AANLkTinUVnBxtp8-_QMh0m-DuqK4mK1=vof_avuV4XFU@mail.gmail.com","threadId":"26883","inReplyTo":"92140045-86C2-4525-A867-7654D3FE53FB@gmail.com","subject":"Re: [PATCH] Fix two unused variable warnings in gcc 4.6","fromName":"Dan McGee","fromEmail":"dpmcgee@gmail.com","sentAt":"2011-03-28T13:57:54Z","receivedAt":"2011-03-28T13:57:54Z","isPatch":true,"sender":{"key":"dpmcgee@gmail.com","avatar":"https://avatars.githubusercontent.com/u/265817?v=4"},"body":"On Mon, Mar 28, 2011 at 8:05 AM, Joshua Juran <jjuran@gmail.com> wrote:\n> On Mar 27, 2011, at 6:32 PM, Dan McGee wrote:\n>\n>> diff --git a/http-fetch.c b/http-fetch.c\n>> index 923904f..3af4c71 100644\n>> --- a/http-fetch.c\n>> +++ b/http-fetch.c\n>> @@ -8,7 +8,6 @@ static const char http_fetch_usage[] = \"git http-fetch \"\n>>\n>> int main(int argc, const char **argv)\n>> {\n>> -       const char *prefix;\n>>        struct walker *walker;\n>>        int commits_on_stdin = 0;\n>>        int commits;\n>> diff --git a/merge-recursive.c b/merge-recursive.c\n>> index 8e82a8b..af13150 100644\n>> --- a/merge-recursive.c\n>> +++ b/merge-recursive.c\n>> @@ -356,7 +356,6 @@ static void\n>> make_room_for_directories_of_df_conflicts(struct merge_options *o,\n>>         */\n>>        const char *last_file = NULL;\n>>        int last_len = 0;\n>> -       struct stage_data *last_e;\n>>        int i;\n>>\n>>        for (i = 0; i < entries->nr; i++) {\n>> @@ -961,7 +959,6 @@ static int process_renames(struct merge_options *o,\n>>        }\n>>\n>>        for (i = 0, j = 0; i < a_renames->nr || j < b_renames->nr;) {\n>> -               char *src;\n>>                struct string_list *renames1, *renames2Dst;\n>>                struct rename *ren1 = NULL, *ren2 = NULL;\n>>                const char *branch1, *branch2;\n>\n> Looks like three unused variables, not two.\n\nYou are correct, my lack of caffeine can be blamed for the misleading\nmessage. I didn't think it was important enough to resubmit for that\nthough.\n\n-Dan\n"}]}