diff options
author | Guy Harris <guy@alum.mit.edu> | 2000-11-19 08:54:37 +0000 |
---|---|---|
committer | Guy Harris <guy@alum.mit.edu> | 2000-11-19 08:54:37 +0000 |
commit | 252d55d80f92fa8267758fbf4faab520d2f79273 (patch) | |
tree | b6449cf609799ebb75b91e1cd6b600b06ee3d11a /packet-nbipx.c | |
parent | e88bd04f9aa217173cc86d785e9206e272a832ce (diff) |
For each column, have both a buffer into which strings for that column
can be put, and a pointer to the string for the column, which might or
might not point to that buffer.
Add a routine "col_set_str()", which sets the string for the column to
the string passed to it as an argument; it should only be handed a
static string (a string constant would be ideal). It doesn't do any
copying, so it's faster than "col_add_str()".
Make the routines that append to columns check whether the pointer to
the string for the column points to the buffer for the column and, if
not, copy the string for the column to the buffer for the column so that
you can append to it (so you can use "col_set_str()" and then use
"col_append_str()" or "col_append_fstr()").
Convert a bunch of "col_add_str()" calls that take a string constant as
an argument to "col_set_str()" calls.
Convert some "col_add_fstr()" calls that take a string constant as the
only argument - i.e., the format string doesn't have any "%" slots into
which to put strings for subsequent arguments to "col_set_str()" calls
(those calls are just like "col_add_str()" calls).
Replace an END_OF_FRAME reference in a tvbuffified dissector with a
"tvb_length(tvb)" call.
svn path=/trunk/; revision=2670
Diffstat (limited to 'packet-nbipx.c')
-rw-r--r-- | packet-nbipx.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/packet-nbipx.c b/packet-nbipx.c index fc9c265aec..ae67f2a8c9 100644 --- a/packet-nbipx.c +++ b/packet-nbipx.c @@ -2,7 +2,7 @@ * Routines for NetBIOS over IPX packet disassembly * Gilbert Ramirez <gram@xiexie.org> * - * $Id: packet-nbipx.c,v 1.28 2000/11/17 21:00:35 gram Exp $ + * $Id: packet-nbipx.c,v 1.29 2000/11/19 08:54:00 guy Exp $ * * Ethereal - Network traffic analyzer * By Gerald Combs <gerald@zing.org> @@ -120,7 +120,7 @@ dissect_nbipx(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) pinfo->current_proto = "NBIPX"; if (check_col(pinfo->fd, COL_PROTOCOL)) - col_add_str(pinfo->fd, COL_PROTOCOL, "NBIPX"); + col_set_str(pinfo->fd, COL_PROTOCOL, "NBIPX"); /* * As said above, we look at the length of the packet to decide @@ -303,7 +303,7 @@ dissect_nwlink_dg(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) node_name_type = get_netbios_name(tvb, offset+52, node_name); if (check_col(pinfo->fd, COL_PROTOCOL)) - col_add_str(pinfo->fd, COL_PROTOCOL, "NWLink"); + col_set_str(pinfo->fd, COL_PROTOCOL, "NWLink"); if (check_col(pinfo->fd, COL_INFO)) { /* @@ -344,7 +344,7 @@ dissect_nwlink_dg(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) break; default: - col_add_str(pinfo->fd, COL_INFO, "NetBIOS over IPX (NWLink)"); + col_set_str(pinfo->fd, COL_INFO, "NetBIOS over IPX (NWLink)"); break; } } |