osmith
/
wireshark
forked from osmocom/wireshark
1
0
Fork 0
Code Pull Requests Releases Wiki Activity

"proto_tree_add_text()" takes printf-style arguments; there's no need to 

use snprintf to format a string into a buffer and then supply that
string to "proto_tree_add_text()".

svn path=/trunk/; revision=7395
This commit is contained in:
Guy Harris 2003-04-02 08:31:37 +00:00
parent 56fdae2082
commit 2e82b12e7c
2 changed files with 10 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
packet-isis-clv.c
View File

@ -1,7 +1,7 @@
/* packet-isis-clv.c
* Common CLV decode routines.
*
* $Id: packet-isis-clv.c,v 1.23 2002/08/28 21:00:18 jmayer Exp $
* $Id: packet-isis-clv.c,v 1.24 2003/04/02 08:31:37 guy Exp $
* Stuart Stanley <stuarts@mxmail.net>
*
* Ethereal - Network traffic analyzer
@ -503,7 +503,6 @@ isis_dissect_clvs(tvbuff_t *tvb, proto_tree *tree, int offset,
int q;
proto_item *ti;
proto_tree *clv_tree;
char sbuf[255];
int adj;
while ( len > 0 ) {
@ -528,10 +527,9 @@ isis_dissect_clvs(tvbuff_t *tvb, proto_tree *tree, int offset,
if ( opts[q].dissect ) {
if (tree) {
/* adjust by 2 for code/len octets */
snprintf ( sbuf, sizeof(sbuf), "%s (%d)",
opts[q].tree_text, length );
ti = proto_tree_add_text(tree, tvb, offset - 2,
length + 2, sbuf);
length + 2, "%s (%u)",
opts[q].tree_text, length );
clv_tree = proto_item_add_subtree(ti,
*opts[q].tree_id );
} else {
@ -541,10 +539,9 @@ isis_dissect_clvs(tvbuff_t *tvb, proto_tree *tree, int offset,
id_length, length);
} else {
if (tree) {
snprintf ( sbuf, sizeof(sbuf),
"Unknown code (%d:%d)", code, length );
ti = proto_tree_add_text(tree, tvb, offset - 2,
length + 2, sbuf);
length + 2, "Unknown code %u (%u)",
code, length);
clv_tree = proto_item_add_subtree(ti,
unknown_tree_id );
} else {

13
packet-nlsp.c
View File

@ -1,7 +1,7 @@
/* packet-nlsp.c
* Routines for NetWare Link Services Protocol
*
* $Id: packet-nlsp.c,v 1.3 2003/04/02 08:13:35 guy Exp $
* $Id: packet-nlsp.c,v 1.4 2003/04/02 08:31:37 guy Exp $
*
* Based on ISIS dissector by Stuart Stanley <stuarts@mxmail.net>
*
@ -190,7 +190,6 @@ nlsp_dissect_clvs(tvbuff_t *tvb, proto_tree *tree, int offset,
int q;
proto_item *ti;
proto_tree *clv_tree;
char sbuf[255];
int adj;
while ( len > 0 ) {
@ -215,10 +214,9 @@ nlsp_dissect_clvs(tvbuff_t *tvb, proto_tree *tree, int offset,
if ( opts[q].dissect ) {
if (tree) {
/* adjust by 2 for code/len octets */
snprintf ( sbuf, sizeof(sbuf), "%s (%d)",
opts[q].tree_text, length );
ti = proto_tree_add_text(tree, tvb, offset - 2,
length + 2, sbuf);
length + 2, "%s (%u)",
opts[q].tree_text, length );
clv_tree = proto_item_add_subtree(ti,
*opts[q].tree_id );
} else {
@ -228,10 +226,9 @@ nlsp_dissect_clvs(tvbuff_t *tvb, proto_tree *tree, int offset,
length);
} else {
if (tree) {
snprintf ( sbuf, sizeof(sbuf),
"Unknown code (%d:%d)", code, length );
ti = proto_tree_add_text(tree, tvb, offset - 2,
length + 2, sbuf);
length + 2, "Unknown code %u (%u)",
code, length);
clv_tree = proto_item_add_subtree(ti,
unknown_tree_id );
} else {