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

[Jani Taskinen]

sniper          Sat Jan  8 07:02:24 2005 EDT

  Modified files:              
    /php-src/ext/snmp   php_snmp.h snmp.c 
  Log:
  - Fix some memory leaks
  
http://cvs.php.net/diff.php/php-src/ext/snmp/php_snmp.h?r1=1.22&r2=1.23&ty=u
Index: php-src/ext/snmp/php_snmp.h
diff -u php-src/ext/snmp/php_snmp.h:1.22 php-src/ext/snmp/php_snmp.h:1.23
--- php-src/ext/snmp/php_snmp.h:1.22    Thu Jan  8 12:32:47 2004
+++ php-src/ext/snmp/php_snmp.h Sat Jan  8 07:02:22 2005
@@ -20,7 +20,7 @@
   +----------------------------------------------------------------------+
 */
 
-/* $Id: php_snmp.h,v 1.22 2004/01/08 17:32:47 sniper Exp $ */
+/* $Id: php_snmp.h,v 1.23 2005/01/08 12:02:22 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.94&r2=1.95&ty=u
Index: php-src/ext/snmp/snmp.c
diff -u php-src/ext/snmp/snmp.c:1.94 php-src/ext/snmp/snmp.c:1.95
--- php-src/ext/snmp/snmp.c:1.94        Mon Dec  6 19:33:24 2004
+++ php-src/ext/snmp/snmp.c     Sat Jan  8 07:02:22 2005
@@ -20,7 +20,7 @@
    +----------------------------------------------------------------------+
  */
 
-/* $Id: snmp.c,v 1.94 2004/12/07 00:33:24 iliaa Exp $ */
+/* $Id: snmp.c,v 1.95 2005/01/08 12:02:22 sniper Exp $ */
 
 #ifdef HAVE_CONFIG_H
 #include "config.h"
@@ -147,7 +147,7 @@
        "snmp",
        snmp_functions,
        PHP_MINIT(snmp),
-       NULL,
+       PHP_MSHUTDOWN(snmp),
        NULL,
        NULL,
        PHP_MINFO(snmp),
@@ -174,7 +174,7 @@
  */
 PHP_MINIT_FUNCTION(snmp)
 {
-       init_snmp("snmpapp");
+       init_snmp("php");
 
        ZEND_INIT_MODULE_GLOBALS(snmp, php_snmp_init_globals, NULL);
 
@@ -199,6 +199,16 @@
 }
 /* }}} */
 
+/* {{{ PHP_MSHUTDOWN_FUNCTION
+ */
+PHP_MSHUTDOWN_FUNCTION(snmp)
+{
+       snmp_shutdown("php");
+
+       return SUCCESS;
+}
+/* }}} */
+
 /* {{{ PHP_MINFO_FUNCTION
  */
 PHP_MINFO_FUNCTION(snmp)
@@ -828,7 +838,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) {
@@ -857,7 +867,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