aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorguy <guy@f5534014-38df-0310-8fa8-9805f1628bb7>2003-06-13 04:07:13 +0000
committerguy <guy@f5534014-38df-0310-8fa8-9805f1628bb7>2003-06-13 04:07:13 +0000
commit84d1985557896b064cf6763f4f4a2acd8aecdbc4 (patch)
treebdb4908bfad83b2a854e9071cf2ceb1f07100fe9
parent3678b21168192499abc563d921ca6fc4ad608834 (diff)
"tvb_format_text()" should be able to handle a length argument of 0.
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@7871 f5534014-38df-0310-8fa8-9805f1628bb7
-rw-r--r--packet-ppp.c6
1 files changed, 2 insertions, 4 deletions
diff --git a/packet-ppp.c b/packet-ppp.c
index 73d94f0ac8..383a047b82 100644
--- a/packet-ppp.c
+++ b/packet-ppp.c
@@ -2,7 +2,7 @@
* Routines for ppp packet disassembly
* RFC 1661, RFC 1662
*
- * $Id: packet-ppp.c,v 1.112 2003/06/12 08:33:29 guy Exp $
+ * $Id: packet-ppp.c,v 1.113 2003/06/13 04:07:13 guy Exp $
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
@@ -2119,9 +2119,7 @@ dissect_cbcp_callback_opt(const ip_tcp_opt *optp, tvbuff_t *tvb,
addr_len = tvb_strsize(tvb, offset);
proto_tree_add_text(addr_tree, tvb, offset, addr_len,
"Address: %s",
- addr_len == 1 ?
- "" :
- tvb_format_text(tvb, offset, addr_len - 1));
+ tvb_format_text(tvb, offset, addr_len - 1));
offset += (addr_len + 1);
length -= (addr_len + 1);
}