aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGuy Harris <guy@alum.mit.edu>2019-07-11 12:34:12 -0700
committerGuy Harris <guy@alum.mit.edu>2019-07-11 20:07:52 +0000
commit2dd367a6f88ebd1f298d1551abd31cc23841eb78 (patch)
tree15dcfabd384ce9c7cc53677fdcbee245fb766fa5
parent1509d92f65f1c029480559a24f8b582c4540a1ee (diff)
Squelch more -Wpointer-sign warnings.
Change-Id: Ib167b98df91bd741d83da7449ec52ac954d220af Reviewed-on: https://code.wireshark.org/review/33903 Petri-Dish: Guy Harris <guy@alum.mit.edu> Reviewed-by: Guy Harris <guy@alum.mit.edu>
-rw-r--r--epan/dissectors/packet-adb.c4
-rw-r--r--epan/dissectors/packet-adb_cs.c6
2 files changed, 5 insertions, 5 deletions
diff --git a/epan/dissectors/packet-adb.c b/epan/dissectors/packet-adb.c
index 3039b6ca5f..7bf1d7b6a6 100644
--- a/epan/dissectors/packet-adb.c
+++ b/epan/dissectors/packet-adb.c
@@ -73,7 +73,7 @@ typedef struct service_data_t {
guint32 local_id;
guint32 remote_id;
- const guint8 *service;
+ const gchar *service;
} service_data_t;
typedef struct command_data_t {
@@ -685,7 +685,7 @@ dissect_adb(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *data)
if (is_service) {
proto_tree_add_item(main_tree, hf_service, tvb, offset, -1, ENC_ASCII | ENC_NA);
if (!pinfo->fd->visited && service_data) {
- service_data->service = tvb_get_stringz_enc(wmem_file_scope(), tvb, offset, NULL, ENC_ASCII);
+ service_data->service = (gchar *) tvb_get_stringz_enc(wmem_file_scope(), tvb, offset, NULL, ENC_ASCII);
}
col_append_fstr(pinfo->cinfo, COL_INFO, "Service: %s", tvb_get_stringz_enc(wmem_packet_scope(), tvb, offset, NULL, ENC_ASCII));
offset = tvb_captured_length(tvb);
diff --git a/epan/dissectors/packet-adb_cs.c b/epan/dissectors/packet-adb_cs.c
index 944061690a..fe9f9f4766 100644
--- a/epan/dissectors/packet-adb_cs.c
+++ b/epan/dissectors/packet-adb_cs.c
@@ -245,7 +245,7 @@ dissect_adb_cs(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *data _
offset = tvb_captured_length(tvb);
} else if (pinfo->srcport == server_port) { /* Server sent to Client */
- guint8 *service = SERVICE_NONE;
+ gchar *service = SERVICE_NONE;
wmem_tree_t *subtree;
wmem_tree_key_t key[5];
client_request_t *client_request;
@@ -293,14 +293,14 @@ dissect_adb_cs(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *data _
tvb_get_guint8(tvb, offset + 1), tvb_get_guint8(tvb, offset + 2), tvb_get_guint8(tvb, offset + 3));
offset += 4;
- if (tvb_memeql(tvb, offset - 4, "FAIL", 4) == 0) {
+ if (tvb_memeql(tvb, offset - 4, (const guint8 *) "FAIL", 4) == 0) {
guint32 ulength;
offset = dissect_ascii_uint32(main_tree, hf_hex_ascii_length, ett_length, hf_length, tvb, offset, &ulength);
length = (gint64) ulength;
status = STATUS_FAIL;
- } else if (tvb_memeql(tvb, offset - 4, "OKAY", 4) == 0) {
+ } else if (tvb_memeql(tvb, offset - 4, (const guint8 *) "OKAY", 4) == 0) {
status = STATUS_OKAY;
length = -1;
}