Re: [Qemu-devel] [PATCH] monitor: avoid declaring unused variables

[Luiz Capitulino]

On Mon, 20 Aug 2012 19:55:10 +0000
Blue Swirl <address@hidden> wrote:

> On Mon, Aug 20, 2012 at 3:08 PM, Luiz Capitulino <address@hidden> wrote:
> > On Sat, 18 Aug 2012 20:14:54 +0000
> > Blue Swirl <address@hidden> wrote:
> >
> >> Some variables are only used on !win32, declare
> >> them only when used.
> >>
> >> This avoids a warning in mingw32 build:
> >>   CC    i386-softmmu/monitor.o
> >> /src/qemu/monitor.c: In function 'monitor_fdset_get_fd':
> >> /src/qemu/monitor.c:2575: warning: unused variable 'mon_fd_flags'
> >> /src/qemu/monitor.c:2574: warning: unused variable 'mon_fdset_fd'
> >> /src/qemu/monitor.c:2573: warning: unused variable 'mon_fdset'
> >>
> >> Signed-off-by: Blue Swirl <address@hidden>
> >
> > Reviewed-by: Luiz Capitulino <address@hidden>
> >
> > Do you want this to go through my tree or will you apply it directly?
> 
> I'd like to get this to 1.2, so if you don't have anything in queue, I
> can apply directly.

I have a queue, and will submit a pull request probably tomorrow.

> 
> >
> >> ---
> >>  monitor.c |    2 +-
> >>  1 files changed, 1 insertions(+), 1 deletions(-)
> >>
> >> diff --git a/monitor.c b/monitor.c
> >> index ce42466..480f583 100644
> >> --- a/monitor.c
> >> +++ b/monitor.c
> >> @@ -2570,11 +2570,11 @@ FdsetInfoList *qmp_query_fdsets(Error **errp)
> >>
> >>  int monitor_fdset_get_fd(int64_t fdset_id, int flags)
> >>  {
> >> +#ifndef _WIN32
> >>      MonFdset *mon_fdset;
> >>      MonFdsetFd *mon_fdset_fd;
> >>      int mon_fd_flags;
> >>
> >> -#ifndef _WIN32
> >>      QLIST_FOREACH(mon_fdset, &mon_fdsets, next) {
> >>          if (mon_fdset->id != fdset_id) {
> >>              continue;
> >
>