[PHP-CVS] cvs: php-src(PHP_4_3) /ext/snmp php_snmp.h snmp.c

[Jani Taskinen]

sniper          Sat Jan  8 07:02:50 2005 EDT

  Modified files:              (Branch: PHP_4_3)
    /php-src/ext/snmp   php_snmp.h snmp.c 
  Log:
  MFH: - Fix some memory leaks
  
http://cvs.php.net/diff.php/php-src/ext/snmp/php_snmp.h?r1=1.14.2.4&r2=1.14.2.5&ty=u
Index: php-src/ext/snmp/php_snmp.h
diff -u php-src/ext/snmp/php_snmp.h:1.14.2.4 
php-src/ext/snmp/php_snmp.h:1.14.2.5
--- php-src/ext/snmp/php_snmp.h:1.14.2.4        Sat Jun 21 17:50:01 2003
+++ php-src/ext/snmp/php_snmp.h Sat Jan  8 07:02:50 2005
@@ -20,7 +20,7 @@
   +----------------------------------------------------------------------+
 */
 
-/* $Id: php_snmp.h,v 1.14.2.4 2003/06/21 21:50:01 harrie Exp $ */
+/* $Id: php_snmp.h,v 1.14.2.5 2005/01/08 12:02:50 sniper Exp $ */
 
 #ifndef PHP_SNMP_H
 #define PHP_SNMP_H
@@ -39,6 +39,7 @@
 #endif
 
 PHP_MINIT_FUNCTION(snmp);
+PHP_MSHUTDOWN_FUNCTION(snmp);
 PHP_MINFO_FUNCTION(snmp);
 
 PHP_FUNCTION(snmpget);
http://cvs.php.net/diff.php/php-src/ext/snmp/snmp.c?r1=1.70.2.15&r2=1.70.2.16&ty=u
Index: php-src/ext/snmp/snmp.c
diff -u php-src/ext/snmp/snmp.c:1.70.2.15 php-src/ext/snmp/snmp.c:1.70.2.16
--- php-src/ext/snmp/snmp.c:1.70.2.15   Mon Dec  6 19:34:33 2004
+++ php-src/ext/snmp/snmp.c     Sat Jan  8 07:02:50 2005
@@ -20,7 +20,7 @@
   +----------------------------------------------------------------------+
 */
 
-/* $Id: snmp.c,v 1.70.2.15 2004/12/07 00:34:33 iliaa Exp $ */
+/* $Id: snmp.c,v 1.70.2.16 2005/01/08 12:02:50 sniper Exp $ */
 
 #ifdef HAVE_CONFIG_H
 #include "config.h"
@@ -151,7 +151,7 @@
        "snmp",
        snmp_functions,
        PHP_MINIT(snmp),
-       NULL,
+       PHP_MSHUTDOWN(snmp),
        NULL,
        NULL,
        PHP_MINFO(snmp),
@@ -178,7 +178,7 @@
  */
 PHP_MINIT_FUNCTION(snmp)
 {
-       init_snmp("snmpapp");
+       init_snmp("php");
 
        ZEND_INIT_MODULE_GLOBALS(snmp, php_snmp_init_globals, NULL);
 
@@ -203,6 +203,16 @@
 }
 /* }}} */
 
+/* {{{ PHP_MSHUTDOWN_FUNCTION
+ */
+PHP_MSHUTDOWN_FUNCTION(snmp)
+{
+       snmp_shutdown("php");
+
+       return SUCCESS;
+}
+/* }}} */
+
 /* {{{ PHP_MINFO_FUNCTION
  */
 PHP_MINFO_FUNCTION(snmp)
@@ -816,7 +826,7 @@
                s->securityAuthKeyLen = USM_AUTH_KU_LEN;
                if (s->securityAuthProto == NULL) {
                        /* get .conf set default */
-                       oid *def = 
get_default_authtype(&(s->securityAuthProtoLen));
+                       const oid *def = 
get_default_authtype(&(s->securityAuthProtoLen));
                        s->securityAuthProto = snmp_duplicate_objid(def, 
s->securityAuthProtoLen);
                }
                if (s->securityAuthProto == NULL) {
@@ -845,7 +855,7 @@
                s->securityPrivKeyLen = USM_PRIV_KU_LEN;
                if (s->securityPrivProto == NULL) {
                        /* get .conf set default */
-                       oid *def = 
get_default_privtype(&(s->securityPrivProtoLen));
+                       const oid *def = 
get_default_privtype(&(s->securityPrivProtoLen));
                        s->securityPrivProto = snmp_duplicate_objid(def, 
s->securityPrivProtoLen);
                }
                if (s->securityPrivProto == NULL) {

-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php