From f3e5618eb0a483e060742bd5cadcb7deefd620c0 Mon Sep 17 00:00:00 2001 From: Jakub Zawadzki Date: Wed, 26 Sep 2018 21:20:34 +0200 Subject: sharkd: cast string to be encoded to unsigned char *. It should fix warning reported by Stig: [...]/wireshark/sharkd_session.c:125:20: warning: array subscript is of type 'char' [-Wchar-subscripts] fputs(json_cntrl[str[i]], stdout); ^~~~~~~ Change-Id: I9352174223644394ba2bf76f10ff3bf6b6abcad5 Reviewed-on: https://code.wireshark.org/review/29877 Petri-Dish: Jakub Zawadzki Tested-by: Petri Dish Buildbot Reviewed-by: Anders Broman --- sharkd_session.c | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) (limited to 'sharkd_session.c') diff --git a/sharkd_session.c b/sharkd_session.c index f3937f77e8..d393145288 100644 --- a/sharkd_session.c +++ b/sharkd_session.c @@ -103,7 +103,7 @@ json_find_attr(const char *buf, const jsmntok_t *tokens, int count, const char * } static void -json_puts_string(const char *str) +json_puts_string(const char *s) { static const char json_cntrl[0x20][6] = { @@ -111,15 +111,13 @@ json_puts_string(const char *str) "u0010", "u0011", "u0012", "u0013", "u0014", "u0015", "u0016", "u0017", "u0018", "u0019", "u001a", "u001b", "u001c", "u001d", "u001e", "u001f" }; + const unsigned char *str = (const unsigned char *) s ? s : ""; int i; - if (str == NULL) - str = ""; - putchar('"'); for (i = 0; str[i]; i++) { - if (((unsigned char) str[i]) < 0x20) + if (str[i] < 0x20) { putchar('\\'); fputs(json_cntrl[str[i]], stdout); -- cgit v1.2.3