aboutsummaryrefslogtreecommitdiffstats
path: root/epan/dissectors/packet-image-jfif.c
diff options
context:
space:
mode:
authorsfisher <sfisher@f5534014-38df-0310-8fa8-9805f1628bb7>2007-03-28 21:55:11 +0000
committersfisher <sfisher@f5534014-38df-0310-8fa8-9805f1628bb7>2007-03-28 21:55:11 +0000
commit915762792536e1904394f58ca4962760d84970ee (patch)
treedc1df6288600e883ed53ac7e43a38a2d03abb9f3 /epan/dissectors/packet-image-jfif.c
parent9eb2c4641e6b7e5fc6757979bd9fcc022089f58a (diff)
Remove almost all of the casts I committed recently and in place of
them, add -Wno-pointer-sign to CFLAGS when gcc will accept it. git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@21253 f5534014-38df-0310-8fa8-9805f1628bb7
Diffstat (limited to 'epan/dissectors/packet-image-jfif.c')
-rw-r--r--epan/dissectors/packet-image-jfif.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/epan/dissectors/packet-image-jfif.c b/epan/dissectors/packet-image-jfif.c
index 9eb1229f95..2fbf8fd012 100644
--- a/epan/dissectors/packet-image-jfif.c
+++ b/epan/dissectors/packet-image-jfif.c
@@ -509,7 +509,7 @@ process_app0_segment(proto_tree *tree, tvbuff_t *tvb, guint32 len,
proto_tree_add_item(subtree, hf_len, tvb, 2, 2, FALSE);
- str = (char*)tvb_get_ephemeral_stringz(tvb, 4, &str_size);
+ str = tvb_get_ephemeral_stringz(tvb, 4, &str_size);
ti = proto_tree_add_item(subtree, hf_identifier, tvb, 4, str_size, FALSE);
if (strcmp(str, "JFIF") == 0) {
/* Version */
@@ -603,7 +603,7 @@ process_app1_segment(proto_tree *tree, tvbuff_t *tvb, guint32 len,
proto_tree_add_item(subtree, hf_len, tvb, offset, 2, FALSE);
offset += 2;
- str = (char*)tvb_get_ephemeral_stringz(tvb, offset, &str_size);
+ str = tvb_get_ephemeral_stringz(tvb, offset, &str_size);
ti = proto_tree_add_item(subtree, hf_identifier, tvb, offset, str_size, FALSE);
offset += str_size;
if (strcmp(str, "Exif") == 0) {
@@ -759,7 +759,7 @@ process_app2_segment(proto_tree *tree, tvbuff_t *tvb, guint32 len,
proto_tree_add_item(subtree, hf_len, tvb, 2, 2, FALSE);
- str = (char*)tvb_get_ephemeral_stringz(tvb, 4, &str_size);
+ str = tvb_get_ephemeral_stringz(tvb, 4, &str_size);
ti = proto_tree_add_item(subtree, hf_identifier, tvb, 4, str_size, FALSE);
if (strcmp(str, "FPXR") == 0) {
proto_tree_add_text(tree, tvb, 0, -1, "Exif FlashPix APP2 application marker");