archive/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2025-08-16 05:58:45 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

rename parameter, should not conflict with global symbol -

Browse source 
the socket function
This commit is contained in:
Andrey Hristov 2010-10-05 16:27:49 +00:00
parent e97a07ae9e
commit 548661d96d
3 changed files with 10 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

16
ext/mysqlnd/mysqlnd.c
View file

@ -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) {