CVS update: php3/functions
| From: | zeev | Date: | Thu, 19 Nov 1998 22:03:31 +0000 |
| Subject: | CVS update: php3/functions | ||
| Groups: | php.dev | ||
| Request: | Send a blank email to php-dev+get-2491@lists.php.net to get a copy of this message | ||
Date: Thursday November 19, 1998 @ 17:03
Author: zeev
Update of /repository/php3/functions
In directory asf:/u2/tmp/cvs-serv23231/functions
Modified Files:
formatted_print.c msql.c
Log Message:
- Ensure that msql_error() will not return errors generated by previously-run scripts
- Minor fixes to the error handling in formatted_print.c
Index: php3/functions/formatted_print.c
diff -c php3/functions/formatted_print.c:1.43 php3/functions/formatted_print.c:1.44
*** php3/functions/formatted_print.c:1.43 Sun Nov 15 16:55:22 1998
--- php3/functions/formatted_print.c Thu Nov 19 17:03:23 1998
***************
*** 27,33 ****
+----------------------------------------------------------------------+
*/
! /* $Id: formatted_print.c,v 1.43 1998/11/15 21:55:22 cschneid Exp $ */
#include <math.h> /* modf() */
#ifdef THREAD_SAFE
--- 27,33 ----
+----------------------------------------------------------------------+
*/
! /* $Id: formatted_print.c,v 1.44 1998/11/19 22:03:23 zeev Exp $ */
#include <math.h> /* modf() */
#ifdef THREAD_SAFE
***************
*** 156,162 ****
{
if ((*pos + 1) >= *size) {
*size <<= 1;
! PRINTF_DEBUG(("sprintf: ereallocing buffer to %d bytes\n", *size));
*buffer = erealloc(*buffer, *size);
}
PRINTF_DEBUG(("sprintf: appending '%c', pos=\n", add, *pos));
--- 156,162 ----
{
if ((*pos + 1) >= *size) {
*size <<= 1;
! PRINTF_DEBUG(("%s: ereallocing buffer to %d bytes\n",
GLOBAL(function_state.function_name), *size));
*buffer = erealloc(*buffer, *size);
}
PRINTF_DEBUG(("sprintf: appending '%c', pos=\n", add, *pos));
***************
*** 410,416 ****
inpos += 2;
} else {
if (currarg >= argc && format[inpos + 1] != '%') {
! php3_error(E_WARNING, "sprintf: too few arguments");
return NULL;
}
/* starting a new format specifier, reset variables */
--- 410,418 ----
inpos += 2;
} else {
if (currarg >= argc && format[inpos + 1] != '%') {
! efree(result);
! efree(args);
! php3_error(E_WARNING, "%s(): too few
arguments",GLOBAL(function_state.function_name));
return NULL;
}
/* starting a new format specifier, reset variables */
Index: php3/functions/msql.c
diff -c php3/functions/msql.c:1.97 php3/functions/msql.c:1.98
*** php3/functions/msql.c:1.97 Tue Sep 29 19:33:37 1998
--- php3/functions/msql.c Thu Nov 19 17:03:27 1998
***************
*** 27,33 ****
+----------------------------------------------------------------------+
*/
! /* $Id: msql.c,v 1.97 1998/09/29 23:33:37 shane Exp $ */
#ifdef THREAD_SAFE
#include "tls.h"
#endif
--- 27,33 ----
+----------------------------------------------------------------------+
*/
! /* $Id: msql.c,v 1.98 1998/11/19 22:03:27 zeev Exp $ */
#ifdef THREAD_SAFE
#include "tls.h"
#endif
***************
*** 239,244 ****
--- 239,245 ----
MSQL_TLS_VARS;
MSQL_GLOBAL(php3_msql_module).default_link=-1;
MSQL_GLOBAL(php3_msql_module).num_links = MSQL_GLOBAL(php3_msql_module).num_persistent;
+ msqlErrMsg[0]=0;
return SUCCESS;
}
--
PHP Development Mailing List http://www.php.net/
To unsubscribe send an empty message to php-dev-unsubscribe@lists.php.net
For help: php-dev-help@lists.php.net