diff options
| author | Jörg Mayer <jmayer@loplof.de> | 2003-03-08 11:43:54 +0000 |
|---|---|---|
| committer | Jörg Mayer <jmayer@loplof.de> | 2003-03-08 11:43:54 +0000 |
| commit | 642d0944193dff6bda86b234454ab5e4703d7fbb (patch) | |
| tree | 341e5e6a854db40ea9a1c26c569dea698a07571b | |
| parent | 4d46ba0a271ff21c98644c4ecda1cd05b3216ff4 (diff) | |
| download | wireshark-642d0944193dff6bda86b234454ab5e4703d7fbb.tar.gz wireshark-642d0944193dff6bda86b234454ab5e4703d7fbb.tar.bz2 wireshark-642d0944193dff6bda86b234454ab5e4703d7fbb.zip | |
Ruediger Oertel <ro@suse.de>
Fix invalid preprocessor token pasting.
svn path=/trunk/; revision=7325
| -rw-r--r-- | packet-prism.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/packet-prism.c b/packet-prism.c index eddf353f3c..f6f60287d9 100644 --- a/packet-prism.c +++ b/packet-prism.c @@ -9,7 +9,7 @@ * * By Tim Newsham * - * $Id: packet-prism.c,v 1.9 2002/11/06 21:49:29 guy Exp $ + * $Id: packet-prism.c,v 1.10 2003/03/08 11:43:54 jmayer Exp $ * * Ethereal - Network traffic analyzer * By Gerald Combs <gerald@ethereal.com> @@ -123,15 +123,15 @@ capture_prism(const guchar *pd, int offset, int len, packet_counts *ld) */ #define IFHELP(size, name, var, str) \ proto_tree_add_uint_format(prism_tree, hf_prism_ ## name, \ - tvb, offset, size, hdr. ## var, str, hdr. ## var); \ + tvb, offset, size, hdr.var, str, hdr.var); \ offset += (size) #define INTFIELD(size, name, str) IFHELP(size, name, name, str) #define VALFIELD(name, str) \ proto_tree_add_uint_format(prism_tree, hf_prism_ ## name ## _data, \ - tvb, offset, 12, hdr. ## name ## .data, \ + tvb, offset, 12, hdr.name.data, \ str ": 0x%x (DID 0x%x, Status 0x%x, Length 0x%x)", \ - hdr. ## name ## .data, hdr. ## name ## .did, \ - hdr. ## name ## .status, hdr. ## name ## .len); \ + hdr.name.data, hdr.name.did, \ + hdr.name.status, hdr.name.len); \ offset += 12 static void @@ -198,7 +198,7 @@ dissect_prism(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) str, "prism." #var, size, BASE_HEX, NULL, 0x0, "", HFILL } }, #define INTFIELD2(size, name, str) IFHELP2(size, name, name, str) #define VALFIELD2(name, str) \ - IFHELP2(FT_UINT32, name ## _data, name ## .data, str ## " Field") + IFHELP2(FT_UINT32, name ## _data, name.data, str " Field") void proto_register_prism(void) |