[PATCH] checkout: squelch "'mode' may be used uninitialized in this function" warning

[PATCH] checkout: squelch "'mode' may be used uninitialized in this function" warning

[dsp]

From: David Soria Parra <dsp@php.net>

Use a 'fake' initialization for the 'mode' variable to work around a
GCC warning as in 5a7a367. The necessary condition to initialize 'mode'
will always be true but cannot be checked by the compiler.

Signed-off-by: David Soria Parra <dsp@php.net>
---
 builtin/checkout.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/builtin/checkout.c b/builtin/checkout.c
index 84d3eb3..6b8bf31 100644
--- a/builtin/checkout.c
+++ b/builtin/checkout.c
@@ -157,7 +157,7 @@ static int checkout_merged(int pos, struct checkout *state)
 	unsigned char sha1[20];
 	mmbuffer_t result_buf;
 	unsigned char threeway[3][20];
-	unsigned mode;
+	unsigned mode = mode;
 
 	memset(threeway, 0, sizeof(threeway));
 	while (pos < active_nr) {
-- 
1.7.8.GIT

Re: [PATCH] checkout: squelch "'mode' may be used uninitialized in this function" warning

[David Soria Parra]

Any update on this patch? Is it going to maint?

On 2012-04-30, dsp@php.net <dsp@php.net> wrote:
> From: David Soria Parra <dsp@php.net>
>
> Use a 'fake' initialization for the 'mode' variable to work around a
> GCC warning as in 5a7a367. The necessary condition to initialize 'mode'
> will always be true but cannot be checked by the compiler.
>
> Signed-off-by: David Soria Parra <dsp@php.net>
> ---
>  builtin/checkout.c |    2 +-
>  1 files changed, 1 insertions(+), 1 deletions(-)
>
> diff --git a/builtin/checkout.c b/builtin/checkout.c
> index 84d3eb3..6b8bf31 100644
> --- a/builtin/checkout.c
> +++ b/builtin/checkout.c
> @@ -157,7 +157,7 @@ static int checkout_merged(int pos, struct checkout *state)
>  	unsigned char sha1[20];
>  	mmbuffer_t result_buf;
>  	unsigned char threeway[3][20];
> -	unsigned mode;
> +	unsigned mode = mode;
>  
>  	memset(threeway, 0, sizeof(threeway));
>  	while (pos < active_nr) {

Re: [PATCH] checkout: squelch "'mode' may be used uninitialized in this function" warning

[Jeff King]

On Thu, May 03, 2012 at 10:59:24AM +0000, David Soria Parra wrote:

> Any update on this patch? Is it going to maint?

I doubt it:

> > diff --git a/builtin/checkout.c b/builtin/checkout.c
> > index 84d3eb3..6b8bf31 100644
> > --- a/builtin/checkout.c
> > +++ b/builtin/checkout.c
> > @@ -157,7 +157,7 @@ static int checkout_merged(int pos, struct checkout *state)
> >  	unsigned char sha1[20];
> >  	mmbuffer_t result_buf;
> >  	unsigned char threeway[3][20];
> > -	unsigned mode;
> > +	unsigned mode = mode;

What is this based on? This has been fixed since 335c6e4
(checkout_merged(): squelch false warning from some gcc, 2011-12-15),
which was in v1.7.8.2.

-Peff