chardev: Convert qemu_chr_write() to take a size_t argument

[Qemu-devel] [PATCH v3 03/25] chardev/wctablet: Use unsigned type to hold unsigned value

Posted by Philippe Mathieu-Daudé 6 years, 8 months ago

TabletChardev::query is an array of uint8_t.
Use the same type to hold it (this also silent a -Wsign-conversion
warning in the trace function).

Signed-off-by: Philippe Mathieu-Daudé <philmd@redhat.com>
---
 chardev/trace-events | 2 +-
 chardev/wctablet.c   | 5 +++--
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/chardev/trace-events b/chardev/trace-events
index d0e5f3bbc1..562bfe70e9 100644
--- a/chardev/trace-events
+++ b/chardev/trace-events
@@ -5,7 +5,7 @@ wct_init(void) ""
 wct_cmd_re(void) ""
 wct_cmd_st(void) ""
 wct_cmd_sp(void) ""
-wct_cmd_ts(int input) "0x%02x"
+wct_cmd_ts(uint8_t input) "0x%02x"
 wct_cmd_other(const char *cmd) "%s"
 wct_speed(int speed) "%d"
 
diff --git a/chardev/wctablet.c b/chardev/wctablet.c
index 35dbd29a33..cf7a08a363 100644
--- a/chardev/wctablet.c
+++ b/chardev/wctablet.c
@@ -207,7 +207,8 @@ static int wctablet_chr_write(struct Chardev *chr,
                               const uint8_t *buf, int len)
 {
     TabletChardev *tablet = WCTABLET_CHARDEV(chr);
-    unsigned int i, clen;
+    size_t i;
+    unsigned int clen;
     char *pos;
 
     if (tablet->line_speed != 9600) {
@@ -269,7 +270,7 @@ static int wctablet_chr_write(struct Chardev *chr,
 
     } else if (strncmp((char *)tablet->query, "TS", 2) == 0 &&
                clen == 3) {
-        unsigned int input = tablet->query[2];
+        uint8_t input = tablet->query[2];
         uint8_t codes[7] = {
             0xa3,
             ((input & 0x80) == 0) ? 0x7e : 0x7f,
-- 
2.20.1

Re: [Qemu-devel] [PATCH v3 03/25] chardev/wctablet: Use unsigned type to hold unsigned value

Posted by Gerd Hoffmann 6 years, 8 months ago

On Wed, Feb 20, 2019 at 02:02:10AM +0100, Philippe Mathieu-Daudé wrote:
> TabletChardev::query is an array of uint8_t.
> Use the same type to hold it (this also silent a -Wsign-conversion
> warning in the trace function).
> 
> Signed-off-by: Philippe Mathieu-Daudé <philmd@redhat.com>

Reviewed-by: Gerd Hoffmann <kraxel@redhat.com>

> ---
>  chardev/trace-events | 2 +-
>  chardev/wctablet.c   | 5 +++--
>  2 files changed, 4 insertions(+), 3 deletions(-)
> 
> diff --git a/chardev/trace-events b/chardev/trace-events
> index d0e5f3bbc1..562bfe70e9 100644
> --- a/chardev/trace-events
> +++ b/chardev/trace-events
> @@ -5,7 +5,7 @@ wct_init(void) ""
>  wct_cmd_re(void) ""
>  wct_cmd_st(void) ""
>  wct_cmd_sp(void) ""
> -wct_cmd_ts(int input) "0x%02x"
> +wct_cmd_ts(uint8_t input) "0x%02x"
>  wct_cmd_other(const char *cmd) "%s"
>  wct_speed(int speed) "%d"
>  
> diff --git a/chardev/wctablet.c b/chardev/wctablet.c
> index 35dbd29a33..cf7a08a363 100644
> --- a/chardev/wctablet.c
> +++ b/chardev/wctablet.c
> @@ -207,7 +207,8 @@ static int wctablet_chr_write(struct Chardev *chr,
>                                const uint8_t *buf, int len)
>  {
>      TabletChardev *tablet = WCTABLET_CHARDEV(chr);
> -    unsigned int i, clen;
> +    size_t i;
> +    unsigned int clen;
>      char *pos;
>  
>      if (tablet->line_speed != 9600) {
> @@ -269,7 +270,7 @@ static int wctablet_chr_write(struct Chardev *chr,
>  
>      } else if (strncmp((char *)tablet->query, "TS", 2) == 0 &&
>                 clen == 3) {
> -        unsigned int input = tablet->query[2];
> +        uint8_t input = tablet->query[2];
>          uint8_t codes[7] = {
>              0xa3,
>              ((input & 0x80) == 0) ? 0x7e : 0x7f,
> -- 
> 2.20.1
>

Re: [Qemu-devel] [PATCH v3 03/25] chardev/wctablet: Use unsigned type to hold unsigned value

Posted by Marc-André Lureau 6 years, 8 months ago

Hi

On Wed, Feb 20, 2019 at 2:03 AM Philippe Mathieu-Daudé
<philmd@redhat.com> wrote:
>
> TabletChardev::query is an array of uint8_t.
> Use the same type to hold it (this also silent a -Wsign-conversion
> warning in the trace function).
>
> Signed-off-by: Philippe Mathieu-Daudé <philmd@redhat.com>

Reviewed-by: Marc-André Lureau <marcandre.lureau@redhat.com>

> ---
>  chardev/trace-events | 2 +-
>  chardev/wctablet.c   | 5 +++--
>  2 files changed, 4 insertions(+), 3 deletions(-)
>
> diff --git a/chardev/trace-events b/chardev/trace-events
> index d0e5f3bbc1..562bfe70e9 100644
> --- a/chardev/trace-events
> +++ b/chardev/trace-events
> @@ -5,7 +5,7 @@ wct_init(void) ""
>  wct_cmd_re(void) ""
>  wct_cmd_st(void) ""
>  wct_cmd_sp(void) ""
> -wct_cmd_ts(int input) "0x%02x"
> +wct_cmd_ts(uint8_t input) "0x%02x"
>  wct_cmd_other(const char *cmd) "%s"
>  wct_speed(int speed) "%d"
>
> diff --git a/chardev/wctablet.c b/chardev/wctablet.c
> index 35dbd29a33..cf7a08a363 100644
> --- a/chardev/wctablet.c
> +++ b/chardev/wctablet.c
> @@ -207,7 +207,8 @@ static int wctablet_chr_write(struct Chardev *chr,
>                                const uint8_t *buf, int len)
>  {
>      TabletChardev *tablet = WCTABLET_CHARDEV(chr);
> -    unsigned int i, clen;
> +    size_t i;
> +    unsigned int clen;
>      char *pos;
>
>      if (tablet->line_speed != 9600) {
> @@ -269,7 +270,7 @@ static int wctablet_chr_write(struct Chardev *chr,
>
>      } else if (strncmp((char *)tablet->query, "TS", 2) == 0 &&
>                 clen == 3) {
> -        unsigned int input = tablet->query[2];
> +        uint8_t input = tablet->query[2];
>          uint8_t codes[7] = {
>              0xa3,
>              ((input & 0x80) == 0) ? 0x7e : 0x7f,
> --
> 2.20.1
>