From: Andrey Hristov <andrey@php.net>
Date: Tue, 5 Oct 2010 16:27:49 +0000 (+0000)
Subject: rename parameter, should not conflict with global symbol -
X-Git-Tag: php-5.4.0alpha1~191^2~822
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=60bfedb1e6449168c4f65c6ae8eb33ca131be31a;p=php

rename parameter, should not conflict with global symbol -
the socket function
---

diff --git a/ext/mysqlnd/mysqlnd.c b/ext/mysqlnd/mysqlnd.c
index 2101e8d314..ca561ee8b9 100644
--- a/ext/mysqlnd/mysqlnd.c
+++ b/ext/mysqlnd/mysqlnd.c
@@ -547,7 +547,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)
 {
@@ -616,19 +616,19 @@ 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
 		if (host_len == sizeof(".") - 1 && host[0] == '.') {
 			/* named pipe in socket */
-			if (!socket) {
-				socket = "\\\\.\\pipe\\MySQL";
+			if (!socket_or_pipe) {
+				socket_or_pipe = "\\\\.\\pipe\\MySQL";
 			}
-			transport_len = spprintf(&transport, 0, "pipe://%s", socket);
+			transport_len = spprintf(&transport, 0, "pipe://%s", socket_or_pipe);
 			named_pipe = TRUE;
 #endif
 		} else {
@@ -770,7 +770,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);
 			if (unix_socket) {
 				conn->host_info		= mnd_pestrdup("Localhost via UNIX socket", conn->persistent);
 			} else if (named_pipe) {
@@ -873,7 +873,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)
 {
@@ -891,7 +891,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);