| Message ID | 20200321144110.5010-5-philmd@redhat.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | misc: Trivial static code analyzer fixes | expand |
On Sat, Mar 21, 2020 at 03:41:03PM +0100, Philippe Mathieu-Daudé wrote: > Since commit 5a1f49718 the 'olen' variable is not really > used. Remove it to fix a warning reported by Clang static > code analyzer: > > CC hw/input/adb-kbd.o > hw/input/adb-kbd.c:200:5: warning: Value stored to 'olen' is never read > olen = 0; > ^ ~ > > Fixes: 5a1f49718 (adb: add support for QKeyCode) > Reported-by: Clang Static Analyzer > Suggested-by: BALATON Zoltan <balaton@eik.bme.hu> > Signed-off-by: Philippe Mathieu-Daudé <philmd@redhat.com> Acked-by: David Gibson <david@gibson.dropbear.id.au> > --- > v2: Remove 'olen' (Zoltan) > --- > hw/input/adb-kbd.c | 6 +----- > 1 file changed, 1 insertion(+), 5 deletions(-) > > diff --git a/hw/input/adb-kbd.c b/hw/input/adb-kbd.c > index 0ba8207589..a6d5c9b7c9 100644 > --- a/hw/input/adb-kbd.c > +++ b/hw/input/adb-kbd.c > @@ -195,9 +195,7 @@ static int adb_kbd_poll(ADBDevice *d, uint8_t *obuf) > { > KBDState *s = ADB_KEYBOARD(d); > int keycode; > - int olen; > > - olen = 0; > if (s->count == 0) { > return 0; > } > @@ -216,7 +214,6 @@ static int adb_kbd_poll(ADBDevice *d, uint8_t *obuf) > if (keycode == 0x7f) { > obuf[0] = 0x7f; > obuf[1] = 0x7f; > - olen = 2; > } else { > obuf[0] = keycode; > /* NOTE: the power key key-up is the two byte sequence 0xff 0xff; > @@ -224,10 +221,9 @@ static int adb_kbd_poll(ADBDevice *d, uint8_t *obuf) > * byte, but choose not to bother. > */ > obuf[1] = 0xff; > - olen = 2; > } > > - return olen; > + return 2; > } > > static int adb_kbd_request(ADBDevice *d, uint8_t *obuf,
diff --git a/hw/input/adb-kbd.c b/hw/input/adb-kbd.c index 0ba8207589..a6d5c9b7c9 100644 --- a/hw/input/adb-kbd.c +++ b/hw/input/adb-kbd.c @@ -195,9 +195,7 @@ static int adb_kbd_poll(ADBDevice *d, uint8_t *obuf) { KBDState *s = ADB_KEYBOARD(d); int keycode; - int olen; - olen = 0; if (s->count == 0) { return 0; } @@ -216,7 +214,6 @@ static int adb_kbd_poll(ADBDevice *d, uint8_t *obuf) if (keycode == 0x7f) { obuf[0] = 0x7f; obuf[1] = 0x7f; - olen = 2; } else { obuf[0] = keycode; /* NOTE: the power key key-up is the two byte sequence 0xff 0xff; @@ -224,10 +221,9 @@ static int adb_kbd_poll(ADBDevice *d, uint8_t *obuf) * byte, but choose not to bother. */ obuf[1] = 0xff; - olen = 2; } - return olen; + return 2; } static int adb_kbd_request(ADBDevice *d, uint8_t *obuf,
Since commit 5a1f49718 the 'olen' variable is not really used. Remove it to fix a warning reported by Clang static code analyzer: CC hw/input/adb-kbd.o hw/input/adb-kbd.c:200:5: warning: Value stored to 'olen' is never read olen = 0; ^ ~ Fixes: 5a1f49718 (adb: add support for QKeyCode) Reported-by: Clang Static Analyzer Suggested-by: BALATON Zoltan <balaton@eik.bme.hu> Signed-off-by: Philippe Mathieu-Daudé <philmd@redhat.com> --- v2: Remove 'olen' (Zoltan) --- hw/input/adb-kbd.c | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-)