aboutsummaryrefslogtreecommitdiffstats
path: root/epan/dissectors/packet-image-jfif.c
diff options
context:
space:
mode:
authorguy <guy@f5534014-38df-0310-8fa8-9805f1628bb7>2004-09-01 08:12:20 +0000
committerguy <guy@f5534014-38df-0310-8fa8-9805f1628bb7>2004-09-01 08:12:20 +0000
commit3785d7bfae9acf875b77a21d1dd6d1d0e4fa1d06 (patch)
treeb6f128ca2f4be3407e982cebba9d6e808474cafb /epan/dissectors/packet-image-jfif.c
parent4445d4f13fa377d13404bd840befb667628f82c8 (diff)
Get rid of some unused variables.
Put into the protocol tree for APP1 and APP2 segments not otherwise handled an item for the remaining segment data. git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@11870 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, 4 insertions, 2 deletions
diff --git a/epan/dissectors/packet-image-jfif.c b/epan/dissectors/packet-image-jfif.c
index 666584c84d..d09e70a5a1 100644
--- a/epan/dissectors/packet-image-jfif.c
+++ b/epan/dissectors/packet-image-jfif.c
@@ -592,7 +592,6 @@ process_app1_segment(proto_tree *tree, tvbuff_t *tvb, guint32 len,
{
proto_item *ti = NULL;
proto_tree *subtree = NULL;
- proto_tree *subtree_details = NULL;
char *str;
gint str_size;
guint32 offset, tiff_start;
@@ -707,6 +706,8 @@ process_app1_segment(proto_tree *tree, tvbuff_t *tvb, guint32 len,
offset += 4;
proto_tree_add_text(subtree, tvb, offset, -1, "Remainder of APP1 marker skipped");
} else {
+ proto_tree_add_text(subtree, tvb, offset, -1,
+ "Remaining segment data (%u bytes)", len - 2 - str_size);
proto_item_append_text(ti, " (Unknown identifier)");
}
}
@@ -721,7 +722,6 @@ process_app2_segment(proto_tree *tree, tvbuff_t *tvb, guint32 len,
{
proto_item *ti = NULL;
proto_tree *subtree = NULL;
- proto_tree *subtree_details = NULL;
char *str;
gint str_size;
@@ -742,6 +742,8 @@ process_app2_segment(proto_tree *tree, tvbuff_t *tvb, guint32 len,
if (strcmp(str, "FPXR") == 0) {
proto_tree_add_text(tree, tvb, 0, -1, "Exif FlashPix APP2 application marker");
} else {
+ proto_tree_add_text(subtree, tvb, 4 + str_size, -1,
+ "Remaining segment data (%u bytes)", len - 2 - str_size);
proto_item_append_text(ti, " (Unknown identifier)");
}
}