summaryrefslogtreecommitdiff
path: root/epan/tvbparse.c
diff options
context:
space:
mode:
authorYan Burman <yanb@mellanox.com>2014-06-18 10:18:39 +0300
committerEvan Huus <eapache@gmail.com>2014-06-18 07:23:38 +0000
commit4aad9d3b58062562dff00b834989ae626dc5e03f (patch)
tree98d925aca842b478a3b322fbe1848e0314c90ff4 /epan/tvbparse.c
parent544066530b08f616fcdc7f16fe546acfa5a766a9 (diff)
downloadwireshark-4aad9d3b58062562dff00b834989ae626dc5e03f.tar.gz
Fix compilation warning
Change-Id: Ia7922415d8b22ba0c5a04ad6940c7e10bc205d57 Reviewed-on: https://code.wireshark.org/review/2371 Reviewed-by: Evan Huus <eapache@gmail.com>
Diffstat (limited to 'epan/tvbparse.c')
-rw-r--r--epan/tvbparse.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/epan/tvbparse.c b/epan/tvbparse.c
index 8ae2aba12a..97514d9b1c 100644
--- a/epan/tvbparse.c
+++ b/epan/tvbparse.c
@@ -225,7 +225,7 @@ tvbparse_wanted_t* tvbparse_chars(const int id,
char *accept_str;
gsize i;
- accept_str = g_malloc(256);
+ accept_str = (char *)g_malloc(256);
memset(accept_str, 0x00, 256);
for (i = 0; chr[i]; i++)
accept_str[(unsigned) chr[i]] = 0xFF;
@@ -305,7 +305,7 @@ tvbparse_wanted_t* tvbparse_not_chars(const int id,
gsize i;
/* cond_chars_common() use accept string, so mark all elements with, and later unset from reject */
- accept_str = g_malloc(256);
+ accept_str = (char *)g_malloc(256);
memset(accept_str, 0xFF, 256);
for (i = 0; chr[i]; i++)
accept_str[(unsigned) chr[i]] = '\0';