From: Dan McGee <dpmcgee@gmail.com>
Date: Mon, 28 Mar 2011 13:57:54 GMT
Subject: Re: [PATCH] Fix two unused variable warnings in gcc 4.6
Message-ID: <AANLkTinUVnBxtp8-_QMh0m-DuqK4mK1=vof_avuV4XFU@mail.gmail.com>
In-Reply-To: <92140045-86C2-4525-A867-7654D3FE53FB@gmail.com>

On Mon, Mar 28, 2011 at 8:05 AM, Joshua Juran <jjuran@gmail.com> wrote:
> On Mar 27, 2011, at 6:32 PM, Dan McGee wrote:
>
>> diff --git a/http-fetch.c b/http-fetch.c
>> index 923904f..3af4c71 100644
>> --- a/http-fetch.c
>> +++ b/http-fetch.c
>> @@ -8,7 +8,6 @@ static const char http_fetch_usage[] = "git http-fetch "
>>
>> int main(int argc, const char **argv)
>> {
>> -       const char *prefix;
>>        struct walker *walker;
>>        int commits_on_stdin = 0;
>>        int commits;
>> diff --git a/merge-recursive.c b/merge-recursive.c
>> index 8e82a8b..af13150 100644
>> --- a/merge-recursive.c
>> +++ b/merge-recursive.c
>> @@ -356,7 +356,6 @@ static void
>> make_room_for_directories_of_df_conflicts(struct merge_options *o,
>>         */
>>        const char *last_file = NULL;
>>        int last_len = 0;
>> -       struct stage_data *last_e;
>>        int i;
>>
>>        for (i = 0; i < entries->nr; i++) {
>> @@ -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;) {
>> -               char *src;
>>                struct string_list *renames1, *renames2Dst;
>>                struct rename *ren1 = NULL, *ren2 = NULL;
>>                const char *branch1, *branch2;
>
> Looks like three unused variables, not two.

You are correct, my lack of caffeine can be blamed for the misleading
message. I didn't think it was important enough to resubmit for that
though.

-Dan