[sheepdog] [PATCH] corosync: fix a compiler warning

[Hitoshi Mitake]

At Fri, 31 Oct 2014 10:28:34 +0800,
Jinzhi Chen wrote:
> 
> [1  <multipart/alternative (7bit)>]
> [1.1  <text/plain; UTF-8 (quoted-printable)>]
> this problem still exits in the master branch,
> seems not merged into master or devel branch

On my environment, the warning messages cannot be seen. Could you
provide information of your environment (e.g. glibc version?)?

Thanks,
Hitoshi

> 
> On Tue, Oct 14, 2014 at 4:13 PM, Liu Yuan <namei.unix at gmail.com> wrote:
> 
> > Fix following warning:
> >
> > ...
> > cluster/corosync.c: In function ‘corosync_get_local_addr’:
> > cluster/corosync.c:132:22: warning: declaration of ‘sin’ shadows a global
> > declaration [-Wshadow]
> >   CCLD   sheep
> > make[1]: Leaving directory `/home/test/sheepdog/sheep'
> > ...
> >
> > Signed-off-by: Liu Yuan <namei.unix at gmail.com>
> > ---
> >  sheep/cluster/corosync.c | 4 ++--
> >  1 file changed, 2 insertions(+), 2 deletions(-)
> >
> > diff --git a/sheep/cluster/corosync.c b/sheep/cluster/corosync.c
> > index f876112..b7fc025 100644
> > --- a/sheep/cluster/corosync.c
> > +++ b/sheep/cluster/corosync.c
> > @@ -129,7 +129,7 @@ static int corosync_get_local_addr(uint8_t *addr)
> >         int ret, nr;
> >         corosync_cfg_node_address_t caddr;
> >         struct sockaddr_storage *ss = (struct sockaddr_storage
> > *)caddr.address;
> > -       struct sockaddr_in *sin = (struct sockaddr_in *)caddr.address;
> > +       struct sockaddr_in *sin4 = (struct sockaddr_in *)caddr.address;
> >         struct sockaddr_in6 *sin6 = (struct sockaddr_in6 *)caddr.address;
> >         void *saddr;
> >
> > @@ -149,7 +149,7 @@ static int corosync_get_local_addr(uint8_t *addr)
> >                 saddr = &sin6->sin6_addr;
> >                 memcpy(addr, saddr, 16);
> >         } else if (ss->ss_family == AF_INET) {
> > -               saddr = &sin->sin_addr;
> > +               saddr = &sin4->sin_addr;
> >                 memset(addr, 0, 16);
> >                 memcpy(addr + 12, saddr, 4);
> >         } else {
> > --
> > 1.9.1
> >
> > --
> > sheepdog mailing list
> > sheepdog at lists.wpkg.org
> > http://lists.wpkg.org/mailman/listinfo/sheepdog
> >
> [1.2  <text/html; UTF-8 (quoted-printable)>]
> 
> [2  <text/plain; us-ascii (7bit)>]
> -- 
> sheepdog mailing list
> sheepdog at lists.wpkg.org
> http://lists.wpkg.org/mailman/listinfo/sheepdog