Patchwork [U-Boot] sandbox: fix compiler warning

login
register
mail settings
Submitter Allen Martin
Date Jan. 22, 2013, 9:42 p.m.
Message ID <1358890962-24866-1-git-send-email-amartin@nvidia.com>
Download mbox | patch
Permalink /patch/214667/
State Superseded
Headers show

Comments

Allen Martin - Jan. 22, 2013, 9:42 p.m.
Fix compiler warning about control flow reaching end of non void
function.

Signed-off-by: Allen Martin <amartin@nvidia.com>
---
 arch/sandbox/cpu/start.c |    3 +++
 1 file changed, 3 insertions(+)
Simon Glass - Jan. 22, 2013, 9:56 p.m.
On Tue, Jan 22, 2013 at 1:42 PM, Allen Martin <amartin@nvidia.com> wrote:
> Fix compiler warning about control flow reaching end of non void
> function.
>
> Signed-off-by: Allen Martin <amartin@nvidia.com>

Should perhaps mention the commit that adding this warning (e05e5de7 I think)

Acked-by: Simon Glass <sjg@chromium.org>

> ---
>  arch/sandbox/cpu/start.c |    3 +++
>  1 file changed, 3 insertions(+)
>
> diff --git a/arch/sandbox/cpu/start.c b/arch/sandbox/cpu/start.c
> index 7603bf9..5287fd5 100644
> --- a/arch/sandbox/cpu/start.c
> +++ b/arch/sandbox/cpu/start.c
> @@ -122,4 +122,7 @@ int main(int argc, char *argv[])
>          * never return.
>          */
>         board_init_f(0);
> +
> +       /* NOTREACHED - board_init_f() does not return */
> +       return 0;
>  }
> --
> 1.7.10.4
>
Allen Martin - Jan. 22, 2013, 10:48 p.m.
On Tue, Jan 22, 2013 at 01:56:23PM -0800, Simon Glass wrote:
> On Tue, Jan 22, 2013 at 1:42 PM, Allen Martin <amartin@nvidia.com> wrote:
> > Fix compiler warning about control flow reaching end of non void
> > function.
> >
> > Signed-off-by: Allen Martin <amartin@nvidia.com>
> 
> Should perhaps mention the commit that adding this warning (e05e5de7 I think)
> 
> Acked-by: Simon Glass <sjg@chromium.org>
> 

It was this commit:

commit fec79acc864bed049b6beae719ccbf2bbec5403a
Author: Mike Frysinger <vapier@gentoo.org>
Date:   Wed Oct 26 00:22:14 2011 +0000

    sandbox: drop unused return

    Signed-off-by: Mike Frysinger <vapier@gentoo.org>
    Acked-by: Simon Glass <sjg@chromium.org>


I'll change the commit messagen and repost and cc Mike as well.


-Allen
Simon Glass - Jan. 22, 2013, 10:58 p.m.
Hi Allen,

On Tue, Jan 22, 2013 at 2:48 PM, Allen Martin <amartin@nvidia.com> wrote:
> On Tue, Jan 22, 2013 at 01:56:23PM -0800, Simon Glass wrote:
>> On Tue, Jan 22, 2013 at 1:42 PM, Allen Martin <amartin@nvidia.com> wrote:
>> > Fix compiler warning about control flow reaching end of non void
>> > function.
>> >
>> > Signed-off-by: Allen Martin <amartin@nvidia.com>
>>
>> Should perhaps mention the commit that adding this warning (e05e5de7 I think)
>>
>> Acked-by: Simon Glass <sjg@chromium.org>
>>
>
> It was this commit:
>
> commit fec79acc864bed049b6beae719ccbf2bbec5403a
> Author: Mike Frysinger <vapier@gentoo.org>
> Date:   Wed Oct 26 00:22:14 2011 +0000
>
>     sandbox: drop unused return
>
>     Signed-off-by: Mike Frysinger <vapier@gentoo.org>
>     Acked-by: Simon Glass <sjg@chromium.org>
>
>
> I'll change the commit messagen and repost and cc Mike as well.

Actually I think that Mike's commit was correct at the time, and it
was Albert's which changed the no-return behaviour of the function
signature in common.h?

>
>
> -Allen
> --
> nvpublic

Regards,
Simon
Allen Martin - Jan. 22, 2013, 11:06 p.m.
On Tue, Jan 22, 2013 at 02:58:58PM -0800, Simon Glass wrote:
> Hi Allen,
> 
> On Tue, Jan 22, 2013 at 2:48 PM, Allen Martin <amartin@nvidia.com> wrote:
> > On Tue, Jan 22, 2013 at 01:56:23PM -0800, Simon Glass wrote:
> >> On Tue, Jan 22, 2013 at 1:42 PM, Allen Martin <amartin@nvidia.com> wrote:
> >> > Fix compiler warning about control flow reaching end of non void
> >> > function.
> >> >
> >> > Signed-off-by: Allen Martin <amartin@nvidia.com>
> >>
> >> Should perhaps mention the commit that adding this warning (e05e5de7 I think)
> >>
> >> Acked-by: Simon Glass <sjg@chromium.org>
> >>
> >
> > It was this commit:
> >
> > commit fec79acc864bed049b6beae719ccbf2bbec5403a
> > Author: Mike Frysinger <vapier@gentoo.org>
> > Date:   Wed Oct 26 00:22:14 2011 +0000
> >
> >     sandbox: drop unused return
> >
> >     Signed-off-by: Mike Frysinger <vapier@gentoo.org>
> >     Acked-by: Simon Glass <sjg@chromium.org>
> >
> >
> > I'll change the commit messagen and repost and cc Mike as well.
> 
> Actually I think that Mike's commit was correct at the time, and it
> was Albert's which changed the no-return behaviour of the function
> signature in common.h?

Oh I see, you're right.  I'll resend.

-Allen

Patch

diff --git a/arch/sandbox/cpu/start.c b/arch/sandbox/cpu/start.c
index 7603bf9..5287fd5 100644
--- a/arch/sandbox/cpu/start.c
+++ b/arch/sandbox/cpu/start.c
@@ -122,4 +122,7 @@  int main(int argc, char *argv[])
 	 * never return.
 	 */
 	board_init_f(0);
+
+	/* NOTREACHED - board_init_f() does not return */
+	return 0;
 }