[PHP-CVS] cvs: php-src(PHP_4_3) /ext/odbc php_odbc.c

2005-01-17 Thread Antony Dovgal 
tony2001Mon Jan 17 10:07:46 2005 EDT

  Modified files:  (Branch: PHP_4_3)
/php-src/ext/odbc   php_odbc.c 
  Log:
  MFH: fix leak
  
  
http://cvs.php.net/diff.php/php-src/ext/odbc/php_odbc.c?r1=1.143.2.17r2=1.143.2.18ty=u
Index: php-src/ext/odbc/php_odbc.c
diff -u php-src/ext/odbc/php_odbc.c:1.143.2.17 
php-src/ext/odbc/php_odbc.c:1.143.2.18
--- php-src/ext/odbc/php_odbc.c:1.143.2.17  Thu Jun 17 20:44:40 2004
+++ php-src/ext/odbc/php_odbc.c Mon Jan 17 10:07:46 2005
@@ -20,7 +20,7 @@
+--+
 */
 
-/* $Id: php_odbc.c,v 1.143.2.17 2004/06/18 00:44:40 iliaa Exp $ */
+/* $Id: php_odbc.c,v 1.143.2.18 2005/01/17 15:07:46 tony2001 Exp $ */
 
 #ifdef HAVE_CONFIG_H
 #include config.h
@@ -2669,15 +2669,17 @@
} else { /* last error message */
len = SQL_MAX_MESSAGE_LENGTH;
}
-   ptr = ecalloc(len + 1, 1);
+   
if (argc == 1) {
ZEND_FETCH_RESOURCE2(conn, odbc_connection *, pv_handle, -1, 
ODBC-Link, le_conn, le_pconn);
+   ptr = ecalloc(len + 1, 1);
if (mode == 0) {
strlcpy(ptr, conn-laststate, len+1);
} else {
strlcpy(ptr, conn-lasterrormsg, len+1);
}
} else {
+   ptr = ecalloc(len + 1, 1);
if (mode == 0) {
strlcpy(ptr, ODBCG(laststate), len+1);
} else {

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

[PHP-CVS] cvs: php-src(PHP_4_3) /ext/odbc php_odbc.c

2005-01-17 Thread Antony Dovgal 
tony2001Mon Jan 17 13:12:07 2005 EDT

  Modified files:  (Branch: PHP_4_3)
/php-src/ext/odbc   php_odbc.c 
  Log:
  MFH: fix wierd DB2 issue
  
  
http://cvs.php.net/diff.php/php-src/ext/odbc/php_odbc.c?r1=1.143.2.18r2=1.143.2.19ty=u
Index: php-src/ext/odbc/php_odbc.c
diff -u php-src/ext/odbc/php_odbc.c:1.143.2.18 
php-src/ext/odbc/php_odbc.c:1.143.2.19
--- php-src/ext/odbc/php_odbc.c:1.143.2.18  Mon Jan 17 10:07:46 2005
+++ php-src/ext/odbc/php_odbc.c Mon Jan 17 13:12:06 2005
@@ -20,7 +20,7 @@
+--+
 */
 
-/* $Id: php_odbc.c,v 1.143.2.18 2005/01/17 15:07:46 tony2001 Exp $ */
+/* $Id: php_odbc.c,v 1.143.2.19 2005/01/17 18:12:06 tony2001 Exp $ */
 
 #ifdef HAVE_CONFIG_H
 #include config.h
@@ -1231,8 +1231,8 @@
 
array_init(return_value);
 
-   add_assoc_stringl_ex(return_value, server, sizeof(server), 
server_name, len1, 1);
-   add_assoc_stringl_ex(return_value, description, 
sizeof(description), desc, len2, 1);
+   add_assoc_string_ex(return_value, server, sizeof(server), 
server_name, 1);
+   add_assoc_string_ex(return_value, description, sizeof(description), 
desc, 1);
 
 }
 /* }}} */

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

[PHP-CVS] cvs: php-src(PHP_4_3) /ext/odbc php_odbc.c /ext/snmp snmp.c /sapi/cgi cgi_main.c

2003-10-16 Thread Ilia Alshanetsky 
iliaa   Thu Oct 16 22:21:38 2003 EDT

  Modified files:  (Branch: PHP_4_3)
/php-src/sapi/cgi   cgi_main.c 
/php-src/ext/odbc   php_odbc.c 
/php-src/ext/snmp   snmp.c 
  Log:
  MFH: Fixed formatting issues (patch by: Joe Orton)
  
  
Index: php-src/sapi/cgi/cgi_main.c
diff -u php-src/sapi/cgi/cgi_main.c:1.190.2.49 php-src/sapi/cgi/cgi_main.c:1.190.2.50
--- php-src/sapi/cgi/cgi_main.c:1.190.2.49  Sun Sep 21 18:08:13 2003
+++ php-src/sapi/cgi/cgi_main.c Thu Oct 16 22:21:34 2003
@@ -20,7 +20,7 @@
+--+
 */
 
-/* $Id: cgi_main.c,v 1.190.2.49 2003/09/21 22:08:13 sas Exp $ */
+/* $Id: cgi_main.c,v 1.190.2.50 2003/10/17 02:21:34 iliaa Exp $ */
 
 #include php.h
 #include php_globals.h
@@ -956,7 +956,7 @@
zend_llist global_vars;
int interactive=0;
 #if FORCE_CGI_REDIRECT
-   int force_redirect = 1;
+   long force_redirect = 1;
char *redirect_status_env = NULL;
 #endif
 
Index: php-src/ext/odbc/php_odbc.c
diff -u php-src/ext/odbc/php_odbc.c:1.143.2.15 php-src/ext/odbc/php_odbc.c:1.143.2.16
--- php-src/ext/odbc/php_odbc.c:1.143.2.15  Thu Aug 14 10:37:33 2003
+++ php-src/ext/odbc/php_odbc.c Thu Oct 16 22:21:35 2003
@@ -20,7 +20,7 @@
+--+
 */
 
-/* $Id: php_odbc.c,v 1.143.2.15 2003/08/14 14:37:33 iliaa Exp $ */
+/* $Id: php_odbc.c,v 1.143.2.16 2003/10/17 02:21:35 iliaa Exp $ */
 
 #ifdef HAVE_CONFIG_H
 #include config.h
@@ -2224,12 +2224,12 @@
list_entry new_le;

if (ODBCG(max_links) != -1  ODBCG(num_links) = 
ODBCG(max_links)) {
-   php_error_docref(NULL TSRMLS_CC, E_WARNING, Too many 
open links (%d), ODBCG(num_links));
+   php_error_docref(NULL TSRMLS_CC, E_WARNING, Too many 
open links (%ld), ODBCG(num_links));
efree(hashed_details);
RETURN_FALSE;
}
if (ODBCG(max_persistent) != -1  ODBCG(num_persistent) = 
ODBCG(max_persistent)) {
-   php_error_docref(NULL TSRMLS_CC, E_WARNING,Too many 
open persistent links (%d), ODBCG(num_persistent));
+   php_error_docref(NULL TSRMLS_CC, E_WARNING,Too many 
open persistent links (%ld), ODBCG(num_persistent));
efree(hashed_details);
RETURN_FALSE;
}
@@ -2308,7 +2308,7 @@
}
}
if (ODBCG(max_links) != -1  ODBCG(num_links) = ODBCG(max_links)) {
-   php_error_docref(NULL TSRMLS_CC, E_WARNING,Too many open 
connections (%d),ODBCG(num_links));
+   php_error_docref(NULL TSRMLS_CC, E_WARNING,Too many open 
connections (%ld),ODBCG(num_links));
efree(hashed_details);
RETURN_FALSE;
}
Index: php-src/ext/snmp/snmp.c
diff -u php-src/ext/snmp/snmp.c:1.70.2.12 php-src/ext/snmp/snmp.c:1.70.2.13
--- php-src/ext/snmp/snmp.c:1.70.2.12   Tue Sep 23 14:26:10 2003
+++ php-src/ext/snmp/snmp.c Thu Oct 16 22:21:37 2003
@@ -20,7 +20,7 @@
   +--+
 */
 
-/* $Id: snmp.c,v 1.70.2.12 2003/09/23 18:26:10 iliaa Exp $ */
+/* $Id: snmp.c,v 1.70.2.13 2003/10/17 02:21:37 iliaa Exp $ */
 
 #ifdef HAVE_CONFIG_H
 #include config.h
@@ -279,13 +279,13 @@
/* ASN_UNSIGNED is the same as ASN_GAUGE */
case ASN_TIMETICKS: /* 0x43, snmp_impl.h */
case ASN_UINTEGER:  /* 0x47, snmp_impl.h */
-   snprintf(buf, sizeof(buf)-1, %u, *vars-val.integer);
+   snprintf(buf, sizeof(buf)-1, %lu, *vars-val.integer);
buf[sizeof(buf)-1]=0;
ZVAL_STRING(val, buf, 1);
break;
 
case ASN_INTEGER:   /* 0x02, asn1.h */
-   snprintf(buf, sizeof(buf)-1, %d, *vars-val.integer);
+   snprintf(buf, sizeof(buf)-1, %ld, *vars-val.integer);
buf[sizeof(buf)-1]=0;
ZVAL_STRING(val, buf, 1);
break;
@@ -906,7 +906,7 @@
/* Setting the security level. */
convert_to_string_ex(a3);
if (netsnmp_session_set_sec_level(session, Z_STRVAL_PP(a3) TSRMLS_CC)) {
-   php_error_docref(NULL TSRMLS_CC, E_WARNING, Invalid security level: 
%s, a3);
+   php_error_docref(NULL TSRMLS_CC, E_WARNING, Invalid security level: 
%s, Z_STRVAL_PP(a3));
RETURN_FALSE;
}
 

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

[PHP-CVS] cvs: php-src(PHP_4_3) /ext/odbc php_odbc.c

2003-08-14 Thread Jani Taskinen 
sniper  Sun Aug 10 22:08:32 2003 EDT

  Modified files:  (Branch: PHP_4_3)
/php-src/ext/odbc   php_odbc.c 
  Log:
  MFH: fix compile warning
  
Index: php-src/ext/odbc/php_odbc.c
diff -u php-src/ext/odbc/php_odbc.c:1.143.2.13 php-src/ext/odbc/php_odbc.c:1.143.2.14
--- php-src/ext/odbc/php_odbc.c:1.143.2.13  Mon Jul 14 12:13:30 2003
+++ php-src/ext/odbc/php_odbc.c Sun Aug 10 22:08:32 2003
@@ -20,7 +20,7 @@
+--+
 */
 
-/* $Id: php_odbc.c,v 1.143.2.13 2003/07/14 16:13:30 sniper Exp $ */
+/* $Id: php_odbc.c,v 1.143.2.14 2003/08/11 02:08:32 sniper Exp $ */
 
 #ifdef HAVE_CONFIG_H
 #include config.h
@@ -1232,7 +1232,7 @@
 
 }
 /* }}} */
-#endif /* HAVE_SQLDATASOURCES *
+#endif /* HAVE_SQLDATASOURCES */
 
 /* {{{ proto resource odbc_exec(resource connection_id, string query [, int flags])
Prepare and execute an SQL statement */



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