diff options
| author | Anders Broman <anders.broman@ericsson.com> | 2020-07-07 09:03:18 +0200 |
|---|---|---|
| committer | Anders Broman <a.broman58@gmail.com> | 2020-07-07 08:41:54 +0000 |
| commit | dc42e2b1cb4d25e4ccb7316a0e19376c94482e5e (patch) | |
| tree | 39790ff1142da240e2468789f2c65edc7eeb9266 | |
| parent | 6f52f969d823037aa4f24fdcedf4d9fbce22d17b (diff) | |
file-rbm: Fix -Wpointer-sign warnings.
Change-Id: I53e84e172e1c03849158ba6df83aa2ff9cfb3054
Reviewed-on: https://code.wireshark.org/review/37766
Petri-Dish: Anders Broman <a.broman58@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Anders Broman <a.broman58@gmail.com>
| -rw-r--r-- | epan/dissectors/file-rbm.c | 12 | ||||
| -rw-r--r-- | epan/dissectors/file-rbm.h | 2 | ||||
| -rw-r--r-- | epan/dissectors/packet-drb.c | 2 |
3 files changed, 8 insertions, 8 deletions
diff --git a/epan/dissectors/file-rbm.c b/epan/dissectors/file-rbm.c index 8f4a627d6d..13d8bff3aa 100644 --- a/epan/dissectors/file-rbm.c +++ b/epan/dissectors/file-rbm.c @@ -87,7 +87,7 @@ static void rbm_set_info(packet_info* pinfo, const gchar* str) col_append_fstr(pinfo->cinfo, COL_INFO, "Ruby Marshal Object: %s", str); } -void get_rbm_integer(tvbuff_t* tvb, guint offset, gint32* value, guint* len) +void get_rbm_integer(tvbuff_t* tvb, guint offset, gint32* value, gint* len) { gint8 c; c = (tvb_get_gint8(tvb, offset) ^ 128) - 128; @@ -167,7 +167,7 @@ static void dissect_rbm_basic(tvbuff_t* tvb _U_, packet_info* pinfo, proto_tree* rbm_set_info(pinfo, *type); } -static void dissect_rbm_string_data_trailer(tvbuff_t* tvb, packet_info* pinfo, proto_tree* tree, guint* offset, const guint8* label, +static void dissect_rbm_string_data_trailer(tvbuff_t* tvb, packet_info* pinfo, proto_tree* tree, guint* offset, const gchar* label, const gchar* prefix, const gchar* trailer, gchar** value_str) { gint32 value = 0; @@ -185,7 +185,7 @@ static void dissect_rbm_string_data_trailer(tvbuff_t* tvb, packet_info* pinfo, p *value_str = wmem_strdup_printf(wmem_packet_scope(), "%s%s%s", prefix, s, trailer); } -static void dissect_rbm_string_data(tvbuff_t* tvb, packet_info* pinfo, proto_tree* tree, guint* offset, const guint8* label, +static void dissect_rbm_string_data(tvbuff_t* tvb, packet_info* pinfo, proto_tree* tree, guint* offset, const gchar* label, const gchar* prefix, gchar** value_str) { dissect_rbm_string_data_trailer(tvb, pinfo, tree, offset, label, prefix, "", value_str); @@ -194,7 +194,7 @@ static void dissect_rbm_string_data(tvbuff_t* tvb, packet_info* pinfo, proto_tre static void dissect_rbm_array(tvbuff_t* tvb, packet_info* pinfo, proto_tree* tree, gint* offset, gchar** value_str) { gint32 value; - guint len; + gint len; gint32 i; proto_tree* array_tree = NULL; proto_tree* array_obj_tree = NULL; @@ -220,7 +220,7 @@ static void dissect_rbm_array(tvbuff_t* tvb, packet_info* pinfo, proto_tree* tre static void dissect_rbm_hash(tvbuff_t* tvb, packet_info* pinfo, proto_tree* tree, gint* offset, gchar** value_str) { gint32 value; - guint len; + gint len; gint32 i; proto_tree* hash_tree = NULL; proto_tree* hash_obj_tree = NULL; @@ -255,7 +255,7 @@ static void dissect_rbm_link(tvbuff_t* tvb, packet_info* pinfo, proto_tree* tree gchar** type, gchar** value_str) { gint32 value; - guint len; + gint len; gchar* label; switch (subtype) { diff --git a/epan/dissectors/file-rbm.h b/epan/dissectors/file-rbm.h index b8469c7d41..e668f22fc2 100644 --- a/epan/dissectors/file-rbm.h +++ b/epan/dissectors/file-rbm.h @@ -15,6 +15,6 @@ void dissect_rbm_inline(tvbuff_t* tvb, packet_info* pinfo, proto_tree* tree, gint* offset, gchar** type, gchar** value); // Extract a ruby marshal integer -void get_rbm_integer(tvbuff_t* tvb, guint offset, gint32* value, guint* len); +void get_rbm_integer(tvbuff_t* tvb, guint offset, gint32* value, gint* len); #endif diff --git a/epan/dissectors/packet-drb.c b/epan/dissectors/packet-drb.c index c0e49a2615..c7773a2fdc 100644 --- a/epan/dissectors/packet-drb.c +++ b/epan/dissectors/packet-drb.c @@ -54,7 +54,7 @@ static void dissect_drb_request(tvbuff_t* tvb, packet_info* pinfo, proto_tree* t { gint32 nargs; gint32 i; - guint len; + gint len; gchar* loop_label; col_append_str(pinfo->cinfo, COL_INFO, " (request)"); |