diff options
| author | Andrey Hristov <andrey@php.net> | 2010-10-05 16:27:49 +0000 |
|---|---|---|
| committer | Andrey Hristov <andrey@php.net> | 2010-10-05 16:27:49 +0000 |
| commit | 548661d96d5f643112c5896d12b8f3ee74affacf (patch) | |
| tree | 5b05b6c72a89e109efae50876bfc4437fc56c946 /ext/mysqlnd/mysqlnd.c | |
| parent | e97a07ae9e1dfb704d86d4840b55faad9f744fc0 (diff) | |
| download | php-git-548661d96d5f643112c5896d12b8f3ee74affacf.tar.gz | |
rename parameter, should not conflict with global symbol -
the socket function
Diffstat (limited to 'ext/mysqlnd/mysqlnd.c')
| -rw-r--r-- | ext/mysqlnd/mysqlnd.c | 16 |
1 files changed, 8 insertions, 8 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) { |