[Pkg-net-snmp-commits] r226 - branches/net-snmp54-dev/debian/patches

[anders-guest at alioth.debian.org]

Author: anders-guest
Date: 2008-02-14 22:02:00 +0000 (Thu, 14 Feb 2008)
New Revision: 226

Modified:
   branches/net-snmp54-dev/debian/patches/31_silence_subcontainer.patch
Log:
adjust patch #31 to SVN changes

Modified: branches/net-snmp54-dev/debian/patches/31_silence_subcontainer.patch
===================================================================
--- branches/net-snmp54-dev/debian/patches/31_silence_subcontainer.patch	2008-02-13 22:37:10 UTC (rev 225)
+++ branches/net-snmp54-dev/debian/patches/31_silence_subcontainer.patch	2008-02-14 22:02:00 UTC (rev 226)
@@ -1,13 +1,15 @@
---- net-snmp-5.3.1.orig/include/net-snmp/library/container.h	2004-09-14 04:29:16.000000000 +0200
-+++ net-snmp-5.3.1/include/net-snmp/library/container.h	2006-12-20 17:25:58.000000000 +0100
-@@ -364,8 +364,8 @@
-                 continue;
-             rc2 = x->insert(x,k);
-             if (rc2) {
+Index: include/net-snmp/library/container.h
+===================================================================
+--- include/net-snmp/library/container.h	(Revision 16805)
++++ include/net-snmp/library/container.h	(Arbeitskopie)
+@@ -358,8 +358,8 @@
+         if(x) {
+             int rc = x->insert(x,k);
+             if(rc)
 -                snmp_log(LOG_ERR,"error on subcontainer '%s' insert (%d)\n",
--                         x->container_name ? x->container_name : "", rc2);
-+/*                snmp_log(LOG_ERR,"error on subcontainer '%s' insert (%d)\n",
-+                         x->container_name ? x->container_name : "", rc2); */
-                 rc = rc2;
-             }
-         }
+-                         x->container_name ? x->container_name : "", rc);
++                /*snmp_log(LOG_ERR,"error on subcontainer '%s' insert (%d)\n",
++                         x->container_name ? x->container_name : "", rc);*/
+             else {
+                 rc = CONTAINER_INSERT_HELPER(x->next, k);
+                 if(rc)