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-x11.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-x11.c')
| -rw-r--r-- | packet-x11.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/packet-x11.c b/packet-x11.c index a43e4383a7..e1082f7a29 100644 --- a/packet-x11.c +++ b/packet-x11.c @@ -2,7 +2,7 @@ * Routines for X11 dissection * Copyright 2000, Christophe Tronche <ch.tronche@computer.org> * - * $Id: packet-x11.c,v 1.12 2000/11/19 02:48:24 guy Exp $ + * $Id: packet-x11.c,v 1.13 2000/11/19 08:54:10 guy Exp $ * * Ethereal - Network traffic analyzer * By Gerald Combs <gerald@unicom.net> @@ -2844,13 +2844,13 @@ dissect_x11_request(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) /* Make entries in Protocol column and Info column on summary display */ if (check_col(pinfo->fd, COL_PROTOCOL)) - col_add_str(pinfo->fd, COL_PROTOCOL, "X11"); + col_set_str(pinfo->fd, COL_PROTOCOL, "X11"); /* This field shows up as the "Info" column in the display; you should make it, if possible, summarize what's in the packet, so that a user looking at the list of packets can tell what type of packet it is. */ if (check_col(pinfo->fd, COL_INFO)) - col_add_str(pinfo->fd, COL_INFO, "X11 request"); + col_set_str(pinfo->fd, COL_INFO, "X11 request"); /* In the interest of speed, if "tree" is NULL, don't do any work not necessary to generate protocol tree items. */ @@ -2875,13 +2875,13 @@ dissect_x11_event(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) /* Make entries in Protocol column and Info column on summary display */ if (check_col(pinfo->fd, COL_PROTOCOL)) - col_add_str(pinfo->fd, COL_PROTOCOL, "X11"); + col_set_str(pinfo->fd, COL_PROTOCOL, "X11"); /* This field shows up as the "Info" column in the display; you should make it, if possible, summarize what's in the packet, so that a user looking at the list of packets can tell what type of packet it is. */ if (check_col(pinfo->fd, COL_INFO)) - col_add_str(pinfo->fd, COL_INFO, "X11 event"); + col_set_str(pinfo->fd, COL_INFO, "X11 event"); /* In the interest of speed, if "tree" is NULL, don't do any work not necessary to generate protocol tree items. */ |