From 548661d96d5f643112c5896d12b8f3ee74affacf Mon Sep 17 00:00:00 2001 From: Andrey Hristov Date: Tue, 5 Oct 2010 16:27:49 +0000 Subject: [PATCH] rename parameter, should not conflict with global symbol - the socket function --- ext/mysqlnd/mysqlnd.c | 16 ++++++++-------- ext/mysqlnd/mysqlnd.h | 2 +- ext/mysqlnd/mysqlnd_structs.h | 2 +- 3 files changed, 10 insertions(+), 10 deletions(-) diff --git a/ext/mysqlnd/mysqlnd.c b/ext/mysqlnd/mysqlnd.c index 6a007b23f2..ee046bf648 100644 --- a/ext/mysqlnd/mysqlnd.c +++ b/ext/mysqlnd/mysqlnd.c @@ -549,7 +549,7 @@ MYSQLND_METHOD(mysqlnd_conn, connect)(MYSQLND * conn, const char *passwd, unsigned int passwd_len, const char *db, unsigned int db_len, unsigned int port, - const char *socket, + const char * socket_or_pipe, unsigned int mysql_flags TSRMLS_DC) { @@ -617,11 +617,11 @@ MYSQLND_METHOD(mysqlnd_conn, connect)(MYSQLND * conn, int transport_len; #ifndef PHP_WIN32 if (host_len == sizeof("localhost") - 1 && !strncasecmp(host, "localhost", host_len)) { - DBG_INF_FMT("socket=%s", socket? socket:"n/a"); - if (!socket) { - socket = "/tmp/mysql.sock"; + DBG_INF_FMT("socket=%s", socket_or_pipe? socket_or_pipe:"n/a"); + if (!socket_or_pipe) { + socket_or_pipe = "/tmp/mysql.sock"; } - transport_len = spprintf(&transport, 0, "unix://%s", socket); + transport_len = spprintf(&transport, 0, "unix://%s", socket_or_pipe); unix_socket = TRUE; } else #endif @@ -764,7 +764,7 @@ MYSQLND_METHOD(mysqlnd_conn, connect)(MYSQLND * conn, } } } else { - conn->unix_socket = mnd_pestrdup(socket, conn->persistent); + conn->unix_socket = mnd_pestrdup(socket_or_pipe, conn->persistent); conn->host_info = mnd_pestrdup("Localhost via UNIX socket", conn->persistent); if (!conn->unix_socket || !conn->host_info) { SET_OOM_ERROR(conn->error_info); @@ -850,7 +850,7 @@ PHPAPI MYSQLND * mysqlnd_connect(MYSQLND * conn, const char *passwd, unsigned int passwd_len, const char *db, unsigned int db_len, unsigned int port, - const char *socket, + const char *socket_or_pipe, unsigned int mysql_flags TSRMLS_DC) { @@ -868,7 +868,7 @@ PHPAPI MYSQLND * mysqlnd_connect(MYSQLND * conn, } } - ret = conn->m->connect(conn, host, user, passwd, passwd_len, db, db_len, port, socket, mysql_flags TSRMLS_CC); + ret = conn->m->connect(conn, host, user, passwd, passwd_len, db, db_len, port, socket_or_pipe, mysql_flags TSRMLS_CC); if (ret == FAIL) { if (self_alloced) { diff --git a/ext/mysqlnd/mysqlnd.h b/ext/mysqlnd/mysqlnd.h index ee30e95083..6f0d67b5ec 100644 --- a/ext/mysqlnd/mysqlnd.h +++ b/ext/mysqlnd/mysqlnd.h @@ -102,7 +102,7 @@ PHPAPI MYSQLND * mysqlnd_connect(MYSQLND *conn, const char *passwd, unsigned int passwd_len, const char *db, unsigned int db_len, unsigned int port, - const char *socket, + const char *socket_or_pipe, unsigned int mysql_flags TSRMLS_DC); diff --git a/ext/mysqlnd/mysqlnd_structs.h b/ext/mysqlnd/mysqlnd_structs.h index 30c9a459a4..a04fc49e3c 100644 --- a/ext/mysqlnd/mysqlnd_structs.h +++ b/ext/mysqlnd/mysqlnd_structs.h @@ -337,7 +337,7 @@ struct st_mysqlnd_protocol_methods typedef enum_func_status (*func_mysqlnd_conn__init)(MYSQLND * conn TSRMLS_DC); -typedef enum_func_status (*func_mysqlnd_conn__connect)(MYSQLND *conn, const char *host, const char * user, const char * passwd, unsigned int passwd_len, const char * db, unsigned int db_len, unsigned int port, const char * socket, unsigned int mysql_flags TSRMLS_DC); +typedef enum_func_status (*func_mysqlnd_conn__connect)(MYSQLND *conn, const char *host, const char * user, const char * passwd, unsigned int passwd_len, const char * db, unsigned int db_len, unsigned int port, const char * socket_or_pipe, unsigned int mysql_flags TSRMLS_DC); typedef ulong (*func_mysqlnd_conn__escape_string)(const MYSQLND * const conn, char *newstr, const char *escapestr, size_t escapestr_len TSRMLS_DC); typedef enum_func_status (*func_mysqlnd_conn__set_charset)(MYSQLND * const conn, const char * const charset TSRMLS_DC); typedef enum_func_status (*func_mysqlnd_conn__query)(MYSQLND *conn, const char *query, unsigned int query_len TSRMLS_DC); -- 2.50.1