CVS update: php3/functions
| From: | sas | Date: | Thu, 17 Jun 1999 10:44:26 +0000 |
| Subject: | CVS update: php3/functions | ||
| Groups: | php.dev | ||
| Request: | Send a blank email to php-dev+get-7051@lists.php.net to get a copy of this message | ||
Date: Thursday June 17, 1999 @ 6:44
Author: sas
Update of /repository/php3/functions
In directory php:/tmp/cvs-serv26302
Modified Files:
mysql.c
Log Message:
socket was only initialized in safe mode
(btw, don't use system call names as variable names, it
may confuse some compilers)
Index: php3/functions/mysql.c
diff -u php3/functions/mysql.c:1.183 php3/functions/mysql.c:1.184
--- php3/functions/mysql.c:1.183 Mon Jun 14 17:59:57 1999
+++ php3/functions/mysql.c Thu Jun 17 06:44:25 1999
@@ -27,7 +27,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: mysql.c,v 1.183 1999/06/14 21:59:57 jim Exp $ */
+/* $Id: mysql.c,v 1.184 1999/06/17 10:44:25 sas Exp $ */
/* TODO:
@@ -386,7 +386,7 @@
#if APACHE
void (*handler) (int);
#endif
- char *user,*passwd,*host,*socket,*tmp;
+ char *user,*passwd,*host,*socket = NULL,*tmp;
char *hashed_details;
int hashed_details_length,port;
MYSQL *mysql;
@@ -398,7 +398,7 @@
if (ARG_COUNT(ht)>0) {
php3_error(E_NOTICE,"SQL safe mode in effect - ignoring host/user/password
information");
}
- host=passwd=socket=NULL;
+ host=passwd=NULL;
user=_php3_get_current_user();
hashed_details_length = strlen(user)+5+3;
hashed_details = (char *) emalloc(hashed_details_length+1);