Patchwork monitor: avoid declaring unused variables

login
register
mail settings
Submitter Blue Swirl
Date Aug. 18, 2012, 8:14 p.m.
Message ID <ece862b13efaa4c37f9e46493eb9920807869ab1.1345320875.git.blauwirbel@gmail.com>
Download mbox | patch
Permalink /patch/178487/
State New
Headers show

Comments

Blue Swirl - Aug. 18, 2012, 8:14 p.m.
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 <blauwirbel@gmail.com>
---
 monitor.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)
Stefan Weil - Aug. 18, 2012, 8:23 p.m.
Am 18.08.2012 22:14, schrieb Blue Swirl:
> 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 <blauwirbel@gmail.com>
> ---
>   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;

Reviewed-by: Stefan Weil <sw@weilnetz.de>
Luiz Capitulino - Aug. 20, 2012, 3:08 p.m.
On Sat, 18 Aug 2012 20:14:54 +0000
Blue Swirl <blauwirbel@gmail.com> 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 <blauwirbel@gmail.com>

Reviewed-by: Luiz Capitulino <lcapitulino@redhat.com>

Do you want this to go through my tree or will you apply it directly?

> ---
>  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;
Blue Swirl - Aug. 20, 2012, 7:55 p.m.
On Mon, Aug 20, 2012 at 3:08 PM, Luiz Capitulino <lcapitulino@redhat.com> wrote:
> On Sat, 18 Aug 2012 20:14:54 +0000
> Blue Swirl <blauwirbel@gmail.com> 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 <blauwirbel@gmail.com>
>
> Reviewed-by: Luiz Capitulino <lcapitulino@redhat.com>
>
> 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.

>
>> ---
>>  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;
>
Luiz Capitulino - Aug. 20, 2012, 8:03 p.m.
On Mon, 20 Aug 2012 19:55:10 +0000
Blue Swirl <blauwirbel@gmail.com> wrote:

> On Mon, Aug 20, 2012 at 3:08 PM, Luiz Capitulino <lcapitulino@redhat.com> wrote:
> > On Sat, 18 Aug 2012 20:14:54 +0000
> > Blue Swirl <blauwirbel@gmail.com> 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 <blauwirbel@gmail.com>
> >
> > Reviewed-by: Luiz Capitulino <lcapitulino@redhat.com>
> >
> > 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;
> >
>

Patch

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;