aboutsummaryrefslogtreecommitdiffstats
path: root/epan/dissectors/packet-daap.c
diff options
context:
space:
mode:
authorguy <guy@f5534014-38df-0310-8fa8-9805f1628bb7>2004-08-22 03:11:43 +0000
committerguy <guy@f5534014-38df-0310-8fa8-9805f1628bb7>2004-08-22 03:11:43 +0000
commiteda2445f008607d145ec9b0ab240abe0cb8ccf2b (patch)
tree6007fa33833b9aa9bbae1a610ddb7ac84edc8c09 /epan/dissectors/packet-daap.c
parentcea67c8150b4be1b31ddf6a31721c2e0922b71b0 (diff)
Use "tvb_get_ntoh64()", now that we have it.
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@11802 f5534014-38df-0310-8fa8-9805f1628bb7
Diffstat (limited to 'epan/dissectors/packet-daap.c')
-rw-r--r--epan/dissectors/packet-daap.c6
1 files changed, 1 insertions, 5 deletions
diff --git a/epan/dissectors/packet-daap.c b/epan/dissectors/packet-daap.c
index f3cb243ff6..759d3d4d3f 100644
--- a/epan/dissectors/packet-daap.c
+++ b/epan/dissectors/packet-daap.c
@@ -185,7 +185,6 @@ dissect_daap_one_tag(proto_tree *tree, tvbuff_t *tvb, int offset, int length)
proto_item *ti = NULL;
proto_item *ti2 = NULL;
proto_tree *new_tree = NULL;
- guint64 persistent_id;
do {
if (!tvb_offset_exists(tvb, offset))
@@ -252,11 +251,8 @@ dissect_daap_one_tag(proto_tree *tree, tvbuff_t *tvb, int offset, int length)
break;
case daap_mper:
/* Tags conain uint64 */
- persistent_id = tvb_get_ntohl(tvb, offset);
- persistent_id <<= 32;
- persistent_id = tvb_get_ntohl(tvb, offset+4);
proto_item_append_text(ti, ", Persistent Id: %" PRIu64,
- persistent_id);
+ tvb_get_ntoh64(tvb, offset));
break;
case daap_mstt:
proto_item_append_text(ti, ", Status: %d",