use proper macros and vars instead of strlen()

diff --git a/ext/mysqli/mysqli_api.c b/ext/mysqli/mysqli_api.c
index 453fb023c4333a1ccbc7da7bb47a57a39af4a03b..f4b35014a6150d31e9b769c75ce2679accbf7abf 100644 (file)
--- a/ext/mysqli/mysqli_api.c
+++ b/ext/mysqli/mysqli_api.c
@@ -571,7 +571,7 @@ PHP_FUNCTION(mysqli_stmt_execute)
                                        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]);

diff --git a/ext/mysqli/mysqli_nonapi.c b/ext/mysqli/mysqli_nonapi.c
index bef10913a7a8bc8c1d1d38ef791b1f0700fa5611..b3346cc861bf7aa8796c96ed9028be5e55521037 100644 (file)
--- a/ext/mysqli/mysqli_nonapi.c
+++ b/ext/mysqli/mysqli_nonapi.c
@@ -75,7 +75,7 @@ PHP_FUNCTION(mysqli_connect)
        }
 
 #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 {