On Wed, 14 Jun 2006 09:42:39 -0700 Wes wrote:
WH> >>>>> On Wed, 14 Jun 2006 09:50:14 -0600, Bruce Shaw
WH> >>>>> <[EMAIL PROTECTED]> said:
WH>
WH> Wes> um, Thomas... in the rc series we should be voting on major changes
WH>
WH> Bruce> like that.
WH>
WH> Bruce> I vote yes.
WH>
WH> Have you reviewed the patch, are is that vote based only on knowing
WH> the description of the problem?
I've attached the patch, since it was never sent anywhere. I've also reviewed
it, and vote for letting it stand.
--
Robert Story; NET-SNMP Junkie
Support: <http://www.net-snmp.org/> <irc://irc.freenode.net/#net-snmp>
Archive: <http://sourceforge.net/mailarchive/forum.php?forum=net-snmp-coders>
You are lost in a twisty maze of little standards, all different.
Index: agent/agent_registry.c
===================================================================
RCS file: /cvsroot/net-snmp/net-snmp/agent/agent_registry.c,v
retrieving revision 5.32.2.4
retrieving revision 5.32.2.5
diff -u -p -r5.32.2.4 -r5.32.2.5
--- agent/agent_registry.c 7 Jun 2006 12:25:18 -0000 5.32.2.4
+++ agent/agent_registry.c 13 Jun 2006 12:50:36 -0000 5.32.2.5
@@ -607,7 +607,7 @@ netsnmp_register_mib(const char *moduleN
DEBUGMSGOIDRANGE(("register_mib", mibloc, mibloclen, range_subid,
range_ubound));
DEBUGMSG(("register_mib", " with context \"%s\"\n",
- (context ? context : "(null)")));
+ SNMP_STRORNULL(context)));
/*
* verify that the passed context is equal to the context
Index: agent/mibgroup/notification-log-mib/notification_log.c
===================================================================
RCS file: /cvsroot/net-snmp/net-snmp/agent/mibgroup/notification-log-mib/notification_log.c,v
retrieving revision 1.10
retrieving revision 1.10.2.1
diff -u -p -r1.10 -r1.10.2.1
--- agent/mibgroup/notification-log-mib/notification_log.c 10 Dec 2005 00:49:32 -0000 1.10
+++ agent/mibgroup/notification-log-mib/notification_log.c 13 Jun 2006 12:50:36 -0000 1.10.2.1
@@ -468,7 +468,7 @@ init_notification_log(void)
NETSNMP_DS_NOTIF_LOG_CTX);
DEBUGMSGTL(("notification_log", "registering with '%s' context\n",
- context));
+ SNMP_STRORNULL(context)));
/*
* static variables
Index: include/net-snmp/library/tools.h
===================================================================
RCS file: /cvsroot/net-snmp/net-snmp/include/net-snmp/library/tools.h,v
retrieving revision 5.8.2.1
retrieving revision 5.8.2.2
diff -u -p -r5.8.2.1 -r5.8.2.2
--- include/net-snmp/library/tools.h 25 Jan 2006 16:27:40 -0000 5.8.2.1
+++ include/net-snmp/library/tools.h 13 Jun 2006 12:50:36 -0000 5.8.2.2
@@ -46,7 +46,7 @@ extern "C" {
#define BYTESIZE(bitsize) ((bitsize + 7) >> 3)
#define ROUNDUP8(x) ( ( (x+7) >> 3 ) * 8 )
-
+#define SNMP_STRORNULL(x) ( x ? x : "(null)")
/** @def SNMP_FREE(s)
Frees a pointer only if it is !NULL and sets its value to NULL */
Index: snmplib/callback.c
===================================================================
RCS file: /cvsroot/net-snmp/net-snmp/snmplib/callback.c,v
retrieving revision 5.14.2.1
retrieving revision 5.14.2.2
diff -u -p -r5.14.2.1 -r5.14.2.2
--- snmplib/callback.c 25 Jan 2006 16:27:41 -0000 5.14.2.1
+++ snmplib/callback.c 13 Jun 2006 12:50:36 -0000 5.14.2.2
@@ -115,7 +115,7 @@ _callback_lock(int major, int minor, con
#ifdef CALLBACK_NAME_LOGGING
DEBUGMSGTL(("9:callback:lock", "locked (%s,%s)\n",
types[major], (SNMP_CALLBACK_LIBRARY == major) ?
- lib[minor] : NULL));
+ SNMP_STRORNULL(lib[minor]) : "null"));
#endif
if (CALLBACK_LOCK(major,minor) > 1)
{
@@ -147,7 +147,7 @@ _callback_unlock(int major, int minor)
#ifdef CALLBACK_NAME_LOGGING
DEBUGMSGTL(("9:callback:lock", "unlocked (%s,%s)\n",
types[major], (SNMP_CALLBACK_LIBRARY == major) ?
- lib[minor] : NULL));
+ SNMP_STRORNULL(lib[minor]) : "null"));
#endif
}
_______________________________________________
Net-snmp-coders mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/net-snmp-coders
