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-l2tp.c | |
| parent | fae651652098b2566cdbe6e48ceaf745111b6238 (diff) | |
| download | wireshark-bdd64cb62b759d6a3118711beb0c0d699499d098.tar.gz wireshark-bdd64cb62b759d6a3118711beb0c0d699499d098.tar.bz2 wireshark-bdd64cb62b759d6a3118711beb0c0d699499d098.zip | |
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-l2tp.c')
| -rw-r--r-- | packet-l2tp.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/packet-l2tp.c b/packet-l2tp.c index c6a5556aab..80a12fed1a 100644 --- a/packet-l2tp.c +++ b/packet-l2tp.c @@ -7,7 +7,7 @@ * Laurent Cazalet <laurent.cazalet@mailclub.net> * Thomas Parvais <thomas.parvais@advalvas.be> * - * $Id: packet-l2tp.c,v 1.4 2000/03/12 04:47:41 gram Exp $ + * $Id: packet-l2tp.c,v 1.5 2000/03/14 06:03:23 guy Exp $ * * Ethereal - Network traffic analyzer * By Gerald Combs <gerald@zing.org> @@ -448,7 +448,7 @@ void dissect_l2tp(const u_char *pd, int offset, frame_data *fd, proto_tree *tree memcpy(&long_type,(tmp_ptr+=8),sizeof(unsigned long)); long_type = htonl(long_type); proto_tree_add_uint_format(l2tp_avp_tree,hf_l2tp_code, offset + 6, 1, - rhcode, " TIE_BREAKER %l 0x%x", long_type,long_type ); + rhcode, " TIE_BREAKER %lu 0x%lx", long_type,long_type ); break; case FIRMWARE_REVISION: |