diff options
| author | Anders Broman <anders.broman@ericsson.com> | 2020-07-07 13:50:56 +0200 |
|---|---|---|
| committer | Anders Broman <a.broman58@gmail.com> | 2020-07-07 12:16:46 +0000 |
| commit | 2b7975db547badc3c4c7f4d7111759aeea076466 (patch) | |
| tree | 0d9939d1bc4f5dfd228709553b3f308d9c0b987e /epan/dissectors/file-jpeg.c | |
| parent | 8a4e53cbeda67ed939e4af01b6ec067be204265e (diff) | |
Fix Wpointer-sign warnings.
Change-Id: I69a266bc945441bc9351b97bd1de0af7f9be46a0
Reviewed-on: https://code.wireshark.org/review/37768
Petri-Dish: Anders Broman <a.broman58@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Anders Broman <a.broman58@gmail.com>
Diffstat (limited to 'epan/dissectors/file-jpeg.c')
| -rw-r--r-- | epan/dissectors/file-jpeg.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/epan/dissectors/file-jpeg.c b/epan/dissectors/file-jpeg.c index 4a2e703a54..56c2e425da 100644 --- a/epan/dissectors/file-jpeg.c +++ b/epan/dissectors/file-jpeg.c @@ -520,7 +520,7 @@ process_app0_segment(proto_tree *tree, tvbuff_t *tvb, guint32 len, proto_tree_add_item(subtree, hf_len, tvb, 2, 2, ENC_BIG_ENDIAN); - str = tvb_get_stringz_enc(wmem_packet_scope(), tvb, 4, &str_size, ENC_ASCII); + str = (char *)tvb_get_stringz_enc(wmem_packet_scope(), tvb, 4, &str_size, ENC_ASCII); ti = proto_tree_add_item(subtree, hf_identifier, tvb, 4, str_size, ENC_ASCII|ENC_NA); if (strcmp(str, "JFIF") == 0) { /* Version */ @@ -599,7 +599,7 @@ process_app1_segment(proto_tree *tree, tvbuff_t *tvb, packet_info *pinfo, guint3 proto_tree_add_item(subtree, hf_len, tvb, offset, 2, ENC_BIG_ENDIAN); offset += 2; - str = tvb_get_stringz_enc(wmem_packet_scope(), tvb, offset, &str_size, ENC_ASCII); + str = (char*)tvb_get_stringz_enc(wmem_packet_scope(), tvb, offset, &str_size, ENC_ASCII); ti = proto_tree_add_item(subtree, hf_identifier, tvb, offset, str_size, ENC_ASCII|ENC_NA); offset += str_size; @@ -723,7 +723,7 @@ process_app2_segment(proto_tree *tree, tvbuff_t *tvb, guint32 len, proto_tree_add_item(subtree, hf_len, tvb, 2, 2, ENC_BIG_ENDIAN); - str = tvb_get_stringz_enc(wmem_packet_scope(), tvb, 4, &str_size, ENC_ASCII); + str = (char*)tvb_get_stringz_enc(wmem_packet_scope(), tvb, 4, &str_size, ENC_ASCII); ti = proto_tree_add_item(subtree, hf_identifier, tvb, 4, str_size, ENC_ASCII|ENC_NA); if (strcmp(str, "FPXR") == 0) { proto_tree_add_item(tree, hf_exif_flashpix_marker, tvb, 0, -1, ENC_NA); @@ -751,10 +751,10 @@ dissect_jfif(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *data _U_ return 0; /* Check identifier field in first App segment is "JFIF", although "Exif" from App1 can/does appear here too... */ - if (tvb_memeql(tvb, 6, "Exif", 5) == 0) { + if (tvb_memeql(tvb, 6, (const guint8*)"Exif", 5) == 0) { show_first_identifier_not_jfif = TRUE; } - else if (tvb_memeql(tvb, 6, "JFIF", 5)) { + else if (tvb_memeql(tvb, 6, (const guint8*)"JFIF", 5)) { return 0; } |