aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGuy Harris <guy@alum.mit.edu>2001-04-07 08:23:58 +0000
committerGuy Harris <guy@alum.mit.edu>2001-04-07 08:23:58 +0000
commit1bfd09545ea271421830e2540d2695f0457eef2b (patch)
tree989051ba0ad07dadef8e046912c36c1177ec9452
parent7da2edcb2e27ce7709139670d81cbf82c41172af (diff)
downloadwireshark-1bfd09545ea271421830e2540d2695f0457eef2b.tar.gz
wireshark-1bfd09545ea271421830e2540d2695f0457eef2b.tar.bz2
wireshark-1bfd09545ea271421830e2540d2695f0457eef2b.zip
At least with UCD SNMP 4.1.2, you can safely pass to "sprint_value()" a
variable with a null pointer-to-value and a zero length, so we don't need to protect the assignment to "variable.val.string" with "SAFE_STRING()" - and doing so causes complaints from the compiler about assigning a pointer to a "const gchar" to the non-const pointer "variable.val.string". svn path=/trunk/; revision=3267
-rw-r--r--packet-snmp.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/packet-snmp.c b/packet-snmp.c
index fa6c994a4f..70f84d0183 100644
--- a/packet-snmp.c
+++ b/packet-snmp.c
@@ -8,7 +8,7 @@
*
* See RFCs 1905, 1906, 1909, and 1910 for SNMPv2u.
*
- * $Id: packet-snmp.c,v 1.62 2001/04/07 00:52:07 guy Exp $
+ * $Id: packet-snmp.c,v 1.63 2001/04/07 08:23:58 guy Exp $
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@zing.org>
@@ -834,7 +834,7 @@ snmp_variable_decode(proto_tree *snmp_tree, subid_t *variable_oid,
if (snmp_tree) {
#ifdef HAVE_SPRINT_VALUE
if (!unsafe) {
- variable.val.string = SAFE_STRING(vb_octet_string);
+ variable.val.string = vb_octet_string;
vb_display_string = format_var(&variable,
variable_oid, variable_oid_length, vb_type,
vb_length);