diff options
| author | Guy Harris <guy@alum.mit.edu> | 2000-03-14 06:03:26 +0000 |
|---|---|---|
| committer | Guy Harris <guy@alum.mit.edu> | 2000-03-14 06:03:26 +0000 |
| commit | bdd64cb62b759d6a3118711beb0c0d699499d098 (patch) | |
| tree | 931af4a0c560f0c694a5b1d795499134ff602f4d /packet-rsvp.c | |
| parent | fae651652098b2566cdbe6e48ceaf745111b6238 (diff) | |
Fix some errors discovered by making GCC do format string/argument
cross-checking, and by replacing "proto_tree_add_item_format()" by
multiple routines to add items of various types.
Make the arguments of "proto_tree_add_bytes_format()" and
"proto_tree_add_string_format()" that specify the bytes or the string be
"const" pointers, so that one can pass a "const" pointer without
complaints from the compiler.
Squelch a (bogus, but the compiler isn't in a position to know that)
complaint about an uninitialized variable.
svn path=/trunk/; revision=1716
Diffstat (limited to 'packet-rsvp.c')
| -rw-r--r-- | packet-rsvp.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/packet-rsvp.c b/packet-rsvp.c index ac8e572683..698666938d 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.17 2000/03/13 05:19:50 ashokn Exp $ + * $Id: packet-rsvp.c,v 1.18 2000/03/14 06:03:24 guy Exp $ * * Ethereal - Network traffic analyzer * By Gerald Combs <gerald@zing.org> @@ -961,8 +961,9 @@ dissect_rsvp(const u_char *pd, int offset, frame_data *fd, proto_tree *tree) memcpy(&ip_addr, pd+offset2+8, 4); proto_tree_add_text(rsvp_object_tree, offset2+8, 4, - "Extended Tunnel ID: %d (%s)", - ntohl(ip_addr), ip_to_str(pd+offset2+8)); + "Extended Tunnel ID: %lu (%s)", + (unsigned long)ntohl(ip_addr), + ip_to_str(pd+offset2+8)); proto_tree_add_item_hidden(rsvp_object_tree, rsvp_filter[RSVPF_SESSION_EXT_TUNNEL_ID], offset2+8, 4, ip_addr); break; |