Patchwork [08/11] vnc: avoid write only variables

login
register
mail settings
Submitter Blue Swirl
Date Oct. 6, 2010, 9:33 p.m.
Message ID <AANLkTi=f0aw0r0HAYmk7r_CpsueG5WZjf0A_Y_khiWW5@mail.gmail.com>
Download mbox | patch
Permalink /patch/66979/
State New
Headers show

Comments

Blue Swirl - Oct. 6, 2010, 9:33 p.m.
Compiling with GCC 4.6.0 20100925 produced warnings:
/src/qemu/ui/vnc.c: In function 'vnc_client_cache_auth':
/src/qemu/ui/vnc.c:217:12: error: variable 'qdict' set but not used
[-Werror=unused-but-set-variable]
/src/qemu/ui/vnc.c: In function 'vnc_display_open':
/src/qemu/ui/vnc.c:2526:9: error: variable 'acl' set but not used
[-Werror=unused-but-set-variable]

Fix by making the variable declarations and their uses also conditional
to debug definition.

Signed-off-by: Blue Swirl <blauwirbel@gmail.com>
---
 ui/vnc.c |    8 ++++++++
 1 files changed, 8 insertions(+), 0 deletions(-)

     if (!vnc_display)
@@ -2581,8 +2587,10 @@ int vnc_display_open(DisplayState *ds, const
char *display)
                 return -1;
             }
 #endif
+#if defined(CONFIG_VNC_TLS) || defined(CONFIG_VNC_SASL)
         } else if (strncmp(options, "acl", 3) == 0) {
             acl = 1;
+#endif
         } else if (strncmp(options, "lossy", 5) == 0) {
             vs->lossy = true;
         }
Paolo Bonzini - Oct. 7, 2010, 7:23 a.m.
On 10/06/2010 11:33 PM, Blue Swirl wrote:
> +#if defined(CONFIG_VNC_TLS) || defined(CONFIG_VNC_SASL)
>           } else if (strncmp(options, "acl", 3) == 0) {
>               acl = 1;
> +#endif

Not sure it's okay to reject the option altogether (i.e. maybe the #if 
should only include "acl = 1".

Paolo
Markus Armbruster - Oct. 7, 2010, 12:26 p.m.
Paolo Bonzini <pbonzini@redhat.com> writes:

> On 10/06/2010 11:33 PM, Blue Swirl wrote:
>> +#if defined(CONFIG_VNC_TLS) || defined(CONFIG_VNC_SASL)
>>           } else if (strncmp(options, "acl", 3) == 0) {
>>               acl = 1;
>> +#endif
>
> Not sure it's okay to reject the option altogether (i.e. maybe the #if

Technically a regression.  Do we care?

> should only include "acl = 1".
Blue Swirl - Oct. 7, 2010, 6:04 p.m.
On Thu, Oct 7, 2010 at 7:23 AM, Paolo Bonzini <pbonzini@redhat.com> wrote:
> On 10/06/2010 11:33 PM, Blue Swirl wrote:
>>
>> +#if defined(CONFIG_VNC_TLS) || defined(CONFIG_VNC_SASL)
>>          } else if (strncmp(options, "acl", 3) == 0) {
>>              acl = 1;
>> +#endif
>
> Not sure it's okay to reject the option altogether (i.e. maybe the #if
> should only include "acl = 1".

It's OK with current code, it doesn't check for invalid options. This
also matches how other options are handled.

Patch

diff --git a/ui/vnc.c b/ui/vnc.c
index c7a1831..864342e 100644
--- a/ui/vnc.c
+++ b/ui/vnc.c
@@ -214,13 +214,17 @@  static int vnc_server_info_put(QDict *qdict)

 static void vnc_client_cache_auth(VncState *client)
 {
+#if defined(CONFIG_VNC_TLS) || defined(CONFIG_VNC_SASL)
     QDict *qdict;
+#endif

     if (!client->info) {
         return;
     }

+#if defined(CONFIG_VNC_TLS) || defined(CONFIG_VNC_SASL)
     qdict = qobject_to_qdict(client->info);
+#endif

 #ifdef CONFIG_VNC_TLS
     if (client->tls.session &&
@@ -2523,7 +2527,9 @@  int vnc_display_open(DisplayState *ds, const
char *display)
     int sasl = 0;
     int saslErr;
 #endif
+#if defined(CONFIG_VNC_TLS) || defined(CONFIG_VNC_SASL)
     int acl = 0;
+#endif
     int lock_key_sync = 1;