tony2001 Mon Oct 10 16:06:39 2005 EDT
Modified files: (Branch: PHP_5_1)
/php-src/ext/mysqli mysqli_api.c mysqli_nonapi.c
Log:
use proper macros and vars instead of strlen()
http://cvs.php.net/diff.php/php-src/ext/mysqli/mysqli_api.c?r1=1.118.2.3&r2=1.118.2.4&ty=u
Index: php-src/ext/mysqli/mysqli_api.c
diff -u php-src/ext/mysqli/mysqli_api.c:1.118.2.3
php-src/ext/mysqli/mysqli_api.c:1.118.2.4
--- php-src/ext/mysqli/mysqli_api.c:1.118.2.3 Mon Oct 10 08:57:54 2005
+++ php-src/ext/mysqli/mysqli_api.c Mon Oct 10 16:06:34 2005
@@ -15,7 +15,7 @@
| Author: Georg Richter <[EMAIL PROTECTED]> |
+----------------------------------------------------------------------+
- $Id: mysqli_api.c,v 1.118.2.3 2005/10/10 12:57:54 tony2001 Exp $
+ $Id: mysqli_api.c,v 1.118.2.4 2005/10/10 20:06:34 tony2001 Exp $
*/
#ifdef HAVE_CONFIG_H
@@ -571,7 +571,7 @@
case MYSQL_TYPE_VAR_STRING:
convert_to_string_ex(&stmt->param.vars[i]);
stmt->stmt->params[i].buffer =
Z_STRVAL_PP(&stmt->param.vars[i]);
-
stmt->stmt->params[i].buffer_length = strlen(Z_STRVAL_PP(&stmt->param.vars[i]));
+
stmt->stmt->params[i].buffer_length = Z_STRLEN_PP(&stmt->param.vars[i]);
break;
case MYSQL_TYPE_DOUBLE:
convert_to_double_ex(&stmt->param.vars[i]);
http://cvs.php.net/diff.php/php-src/ext/mysqli/mysqli_nonapi.c?r1=1.54.2.1&r2=1.54.2.2&ty=u
Index: php-src/ext/mysqli/mysqli_nonapi.c
diff -u php-src/ext/mysqli/mysqli_nonapi.c:1.54.2.1
php-src/ext/mysqli/mysqli_nonapi.c:1.54.2.2
--- php-src/ext/mysqli/mysqli_nonapi.c:1.54.2.1 Mon Oct 10 08:57:55 2005
+++ php-src/ext/mysqli/mysqli_nonapi.c Mon Oct 10 16:06:35 2005
@@ -15,7 +15,7 @@
| Author: Georg Richter <[EMAIL PROTECTED]> |
+----------------------------------------------------------------------+
- $Id: mysqli_nonapi.c,v 1.54.2.1 2005/10/10 12:57:55 tony2001 Exp $
+ $Id: mysqli_nonapi.c,v 1.54.2.2 2005/10/10 20:06:35 tony2001 Exp $
*/
#ifdef HAVE_CONFIG_H
@@ -75,7 +75,7 @@
}
#ifdef HAVE_EMBEDDED_MYSQLI
- if (hostname && strlen(hostname)) {
+ if (hostname_len && hostname) {
unsigned int external=1;
mysql_options(mysql->mysql, MYSQL_OPT_USE_REMOTE_CONNECTION,
(char *)&external);
} else {
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
