diff options
| author | guy <guy@f5534014-38df-0310-8fa8-9805f1628bb7> | 2002-03-02 07:22:20 +0000 |
|---|---|---|
| committer | guy <guy@f5534014-38df-0310-8fa8-9805f1628bb7> | 2002-03-02 07:22:20 +0000 |
| commit | 99c3dae1192cb1f8771d5e6d07beea88523edb8d (patch) | |
| tree | 905701ea1c9bd0bc750a43db2c0cdcc11b453387 /packet-rsvp.c | |
| parent | 89f144cdf5b317c85c5efb2e0bf7f31b71521aec (diff) | |
"ulong" isn't defined on MacOS X (and probably isn't defined on some
other platforms, either) - don't use it. Instead, use "guint32", as the
item in question is a 32-bit unsigned integer.
In fact, it's a 32-bit unsigned integer containing a bit set, and the
data type isn't a "long", so print it with "0x%08x", rather than
"0x%04lx", so that all 8 hex digits are printed, and so that the format
matches the data type.
It also doesn't have to be initialized - the only code path in which
it's used sets it.
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@4842 f5534014-38df-0310-8fa8-9805f1628bb7
Diffstat (limited to 'packet-rsvp.c')
| -rw-r--r-- | packet-rsvp.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/packet-rsvp.c b/packet-rsvp.c index b336015d9b..604295f000 100644 --- a/packet-rsvp.c +++ b/packet-rsvp.c @@ -3,7 +3,7 @@ * * (c) Copyright Ashok Narayanan <ashokn@cisco.com> * - * $Id: packet-rsvp.c,v 1.56 2002/03/01 21:39:01 ashokn Exp $ + * $Id: packet-rsvp.c,v 1.57 2002/03/02 07:22:20 guy Exp $ * * Ethereal - Network traffic analyzer * By Gerald Combs <gerald@ethereal.com> @@ -2657,7 +2657,7 @@ dissect_rsvp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) break; case RSVP_CLASS_ADMIN_STATUS: { - ulong status = 0; + guint32 status; rsvp_object_tree = proto_item_add_subtree(ti, ett_rsvp_admin_status); proto_tree_add_text(rsvp_object_tree, tvb, offset, 2, "Length: %u", obj_length); @@ -2671,7 +2671,7 @@ dissect_rsvp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) "C-type: 1"); status = tvb_get_ntohl(tvb, offset2); ti2 = proto_tree_add_text(rsvp_object_tree, tvb, offset2, 4, - "Admin Status: 0x%04lx", status); + "Admin Status: 0x%08x", status); rsvp_admin_subtree = proto_item_add_subtree(ti2, ett_rsvp_admin_status_flags); proto_tree_add_text(rsvp_admin_subtree, tvb, offset2, 1, |