sesser Thu Mar 6 15:58:20 2003 EDT Modified files: (Branch: PHP_4_3) /php4/ext/cyrus cyrus.c /php4/ext/db db.c /php4/ext/domxml php_domxml.c /php4/ext/fbsql php_fbsql.c /php4/ext/ming ming.c /php4/ext/standard basic_functions.c /php4/ext/xslt sablot.c /php4/ext/zlib zlib.c /php4/main main.c streams.c /php4/sapi/servlet servlet.c Log: MFH
Index: php4/ext/cyrus/cyrus.c diff -u php4/ext/cyrus/cyrus.c:1.12.2.1 php4/ext/cyrus/cyrus.c:1.12.2.2 --- php4/ext/cyrus/cyrus.c:1.12.2.1 Tue Dec 31 11:34:16 2002 +++ php4/ext/cyrus/cyrus.c Thu Mar 6 15:58:14 2003 @@ -16,7 +16,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: cyrus.c,v 1.12.2.1 2002/12/31 16:34:16 sebastian Exp $ */ +/* $Id: cyrus.c,v 1.12.2.2 2003/03/06 20:58:14 sesser Exp $ */ #ifdef HAVE_CONFIG_H #include "config.h" @@ -108,7 +108,7 @@ extern void fatal(char *s, int exit) { - php_error(E_ERROR, s); + php_error(E_ERROR, "%s", s); } /* {{{ proto resource cyrus_connect([ string host [, string port [, int flags]]]) Index: php4/ext/db/db.c diff -u php4/ext/db/db.c:1.81.2.2 php4/ext/db/db.c:1.81.2.3 --- php4/ext/db/db.c:1.81.2.2 Tue Dec 31 11:34:16 2002 +++ php4/ext/db/db.c Thu Mar 6 15:58:14 2003 @@ -17,7 +17,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: db.c,v 1.81.2.2 2002/12/31 16:34:16 sebastian Exp $ */ +/* $Id: db.c,v 1.81.2.3 2003/03/06 20:58:14 sesser Exp $ */ #define IS_EXT_MODULE #ifdef HAVE_CONFIG_H @@ -260,7 +260,7 @@ { /* this isn't pretty ... should break out the info a bit more (cmv) */ php_info_print_box_start(0); - php_printf(php_get_info_db()); + php_printf("%s", php_get_info_db()); php_info_print_box_end(); } /* }}} */ Index: php4/ext/domxml/php_domxml.c diff -u php4/ext/domxml/php_domxml.c:1.218.2.9 php4/ext/domxml/php_domxml.c:1.218.2.10 --- php4/ext/domxml/php_domxml.c:1.218.2.9 Tue Mar 4 08:29:18 2003 +++ php4/ext/domxml/php_domxml.c Thu Mar 6 15:58:14 2003 @@ -16,7 +16,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: php_domxml.c,v 1.218.2.9 2003/03/04 13:29:18 chregu Exp $ */ +/* $Id: php_domxml.c,v 1.218.2.10 2003/03/06 20:58:14 sesser Exp $ */ /* TODO * - Support Notation Nodes @@ -1314,7 +1314,7 @@ va_start(ap, msg); vsnprintf(buf, 1024, msg, ap); va_end(ap); - php_error_docref(NULL TSRMLS_CC, E_WARNING, buf); + php_error_docref(NULL TSRMLS_CC, E_WARNING, "%s", buf); } static void domxml_error_ext(void *ctx, const char *msg, ...) @@ -1351,7 +1351,7 @@ } add_next_index_zval(ctxt->_private,errormessages); } - php_error_docref(NULL TSRMLS_CC, E_WARNING, buf); + php_error_docref(NULL TSRMLS_CC, E_WARNING, "%s", buf); } @@ -1398,7 +1398,7 @@ add_next_index_zval(ctxt->errors,errormessages); } - php_error_docref(NULL TSRMLS_CC, E_WARNING, buf); + php_error_docref(NULL TSRMLS_CC, E_WARNING, "%s", buf); } Index: php4/ext/fbsql/php_fbsql.c diff -u php4/ext/fbsql/php_fbsql.c:1.86.2.3 php4/ext/fbsql/php_fbsql.c:1.86.2.4 --- php4/ext/fbsql/php_fbsql.c:1.86.2.3 Wed Feb 12 15:44:26 2003 +++ php4/ext/fbsql/php_fbsql.c Thu Mar 6 15:58:15 2003 @@ -16,7 +16,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: php_fbsql.c,v 1.86.2.3 2003/02/12 20:44:26 iliaa Exp $ */ +/* $Id: php_fbsql.c,v 1.86.2.4 2003/03/06 20:58:15 sesser Exp $ */ /* TODO: * @@ -735,7 +735,7 @@ if (c == NULL) { if (FB_SQL_G(generateWarnings)) - php_error_docref(NULL TSRMLS_CC, E_WARNING, fbcdcClassErrorMessage()); + php_error_docref(NULL TSRMLS_CC, E_WARNING, "%s", fbcdcClassErrorMessage()); return 0; } md = fbcdcCreateSession(c, "PHP", link->userName, link->userPassword, link->userName); @@ -746,7 +746,7 @@ if (FB_SQL_G(generateWarnings)) { if (emg) - php_error_docref(NULL TSRMLS_CC, E_WARNING, emg); + php_error_docref(NULL TSRMLS_CC, E_WARNING, "%s", emg); else php_error_docref(NULL TSRMLS_CC, E_WARNING, "No message"); } Index: php4/ext/ming/ming.c diff -u php4/ext/ming/ming.c:1.42.2.1 php4/ext/ming/ming.c:1.42.2.2 --- php4/ext/ming/ming.c:1.42.2.1 Tue Dec 31 11:34:54 2002 +++ php4/ext/ming/ming.c Thu Mar 6 15:58:16 2003 @@ -2725,7 +2725,7 @@ vspprintf(&buffer, 0, msg, args); va_end(args); - php_error_docref(NULL TSRMLS_CC, E_ERROR, buffer); + php_error_docref(NULL TSRMLS_CC, E_ERROR, "%s", buffer); efree(buffer); } Index: php4/ext/standard/basic_functions.c diff -u php4/ext/standard/basic_functions.c:1.543.2.8 php4/ext/standard/basic_functions.c:1.543.2.9 --- php4/ext/standard/basic_functions.c:1.543.2.8 Sun Feb 9 14:10:32 2003 +++ php4/ext/standard/basic_functions.c Thu Mar 6 15:58:16 2003 @@ -17,7 +17,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: basic_functions.c,v 1.543.2.8 2003/02/09 19:10:32 sniper Exp $ */ +/* $Id: basic_functions.c,v 1.543.2.9 2003/03/06 20:58:16 sesser Exp $ */ #include "php.h" #include "php_streams.h" @@ -1906,7 +1906,7 @@ zval *retval_ptr; int arg_count = ZEND_NUM_ARGS(); - php_error_docref(NULL TSRMLS_CC, E_NOTICE, _CUM_DEPREC); + php_error_docref(NULL TSRMLS_CC, E_NOTICE, "%s", _CUM_DEPREC); if (arg_count < 2) { WRONG_PARAM_COUNT; @@ -1943,7 +1943,7 @@ HashTable *params_ar; int num_elems, element = 0; - php_error_docref(NULL TSRMLS_CC, E_NOTICE, _CUM_DEPREC); + php_error_docref(NULL TSRMLS_CC, E_NOTICE, "%s", _CUM_DEPREC); if (ZEND_NUM_ARGS() != 3 || zend_get_parameters_ex(3, &method_name, &obj, ¶ms) == FAILURE) { WRONG_PARAM_COUNT; Index: php4/ext/xslt/sablot.c diff -u php4/ext/xslt/sablot.c:1.68.2.2 php4/ext/xslt/sablot.c:1.68.2.3 --- php4/ext/xslt/sablot.c:1.68.2.2 Tue Dec 31 11:35:45 2002 +++ php4/ext/xslt/sablot.c Thu Mar 6 15:58:17 2003 @@ -19,7 +19,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: sablot.c,v 1.68.2.2 2002/12/31 16:35:45 sebastian Exp $ */ +/* $Id: sablot.c,v 1.68.2.3 2003/03/06 20:58:17 sesser Exp $ */ #ifdef HAVE_CONFIG_H #include "config.h" @@ -1797,7 +1797,7 @@ XSLT_REG_ERRMSG(errmsg, handle); /* Output a warning */ - php_error(E_WARNING, msgbuf); + php_error(E_WARNING, "%s", msgbuf); /* Cleanup */ efree(msgbuf); Index: php4/ext/zlib/zlib.c diff -u php4/ext/zlib/zlib.c:1.153.2.6 php4/ext/zlib/zlib.c:1.153.2.7 --- php4/ext/zlib/zlib.c:1.153.2.6 Mon Feb 10 21:26:37 2003 +++ php4/ext/zlib/zlib.c Thu Mar 6 15:58:18 2003 @@ -18,7 +18,7 @@ | Jade Nicoletti <[EMAIL PROTECTED]> | +----------------------------------------------------------------------+ */ -/* $Id: zlib.c,v 1.153.2.6 2003/02/11 02:26:37 moriyoshi Exp $ */ +/* $Id: zlib.c,v 1.153.2.7 2003/03/06 20:58:18 sesser Exp $ */ #define IS_EXT_MODULE #ifdef HAVE_CONFIG_H @@ -450,7 +450,7 @@ RETURN_STRINGL(s2, l2, 0); } else { efree(s2); - php_error_docref(NULL TSRMLS_CC, E_WARNING, zError(status)); + php_error_docref(NULL TSRMLS_CC, E_WARNING, "%s", zError(status)); RETURN_FALSE; } } @@ -507,7 +507,7 @@ RETURN_STRINGL(s2, length, 0); } else { efree(s2); - php_error_docref(NULL TSRMLS_CC, E_WARNING, zError(status)); + php_error_docref(NULL TSRMLS_CC, E_WARNING, "%s", zError(status)); RETURN_FALSE; } } @@ -577,7 +577,7 @@ RETURN_STRINGL(s2, stream.total_out, 0); } else { efree(s2); - php_error_docref(NULL TSRMLS_CC, E_WARNING, zError(status)); + php_error_docref(NULL TSRMLS_CC, E_WARNING, "%s", zError(status)); RETURN_FALSE; } } @@ -659,7 +659,7 @@ RETURN_STRINGL(s2, stream.total_out, 0); } else { efree(s2); - php_error_docref(NULL TSRMLS_CC, E_WARNING, zError(status)); + php_error_docref(NULL TSRMLS_CC, E_WARNING, "%s", zError(status)); RETURN_FALSE; } } @@ -857,14 +857,14 @@ -MAX_WBITS, MAX_MEM_LEVEL, Z_DEFAULT_STRATEGY)) != Z_OK) { - php_error_docref(NULL TSRMLS_CC, E_WARNING, zError(status)); + php_error_docref(NULL TSRMLS_CC, E_WARNING, "%s", zError(status)); RETURN_FALSE; } break; case CODING_DEFLATE: if ((status = deflateInit(&stream, level)) != Z_OK) { - php_error_docref(NULL TSRMLS_CC, E_WARNING, zError(status)); + php_error_docref(NULL TSRMLS_CC, E_WARNING, "%s", zError(status)); RETURN_FALSE; } break; @@ -902,7 +902,7 @@ RETURN_STRINGL(s2, stream.total_out+GZIP_HEADER_LENGTH+(coding==CODING_GZIP?GZIP_FOOTER_LENGTH:0), 0); } else { efree(s2); - php_error_docref(NULL TSRMLS_CC, E_WARNING, zError(status)); + php_error_docref(NULL TSRMLS_CC, E_WARNING, "%s", zError(status)); RETURN_FALSE; } } Index: php4/main/main.c diff -u php4/main/main.c:1.512.2.13 php4/main/main.c:1.512.2.14 --- php4/main/main.c:1.512.2.13 Sun Mar 2 20:54:29 2003 +++ php4/main/main.c Thu Mar 6 15:58:18 2003 @@ -18,7 +18,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: main.c,v 1.512.2.13 2003/03/03 01:54:29 phanto Exp $ */ +/* $Id: main.c,v 1.512.2.14 2003/03/06 20:58:18 sesser Exp $ */ /* {{{ includes */ @@ -832,7 +832,7 @@ # if defined(PHP_WIN32) OutputDebugString(memory_leak_buf); # else - fprintf(stderr, memory_leak_buf); + fprintf(stderr, "%s", memory_leak_buf); # endif #endif } Index: php4/main/streams.c diff -u php4/main/streams.c:1.125.2.36 php4/main/streams.c:1.125.2.37 --- php4/main/streams.c:1.125.2.36 Tue Mar 4 20:28:45 2003 +++ php4/main/streams.c Thu Mar 6 15:58:19 2003 @@ -20,7 +20,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: streams.c,v 1.125.2.36 2003/03/05 01:28:45 wez Exp $ */ +/* $Id: streams.c,v 1.125.2.37 2003/03/06 20:58:19 sesser Exp $ */ #define _GNU_SOURCE #include "php.h" @@ -369,7 +369,7 @@ # if defined(PHP_WIN32) OutputDebugString(leakbuf); # else - fprintf(stderr, leakbuf); + fprintf(stderr, "%s", leakbuf); # endif } else { STR_FREE(stream->__orig_path); @@ -2368,7 +2368,7 @@ va_end(args); if (options & REPORT_ERRORS || wrapper == NULL) { - php_error_docref(NULL TSRMLS_CC, E_WARNING, buffer); + php_error_docref(NULL TSRMLS_CC, E_WARNING, "%s", buffer); efree(buffer); } else { /* append to stack */ Index: php4/sapi/servlet/servlet.c diff -u php4/sapi/servlet/servlet.c:1.65.2.2 php4/sapi/servlet/servlet.c:1.65.2.3 --- php4/sapi/servlet/servlet.c:1.65.2.2 Mon Feb 3 04:04:08 2003 +++ php4/sapi/servlet/servlet.c Thu Mar 6 15:58:19 2003 @@ -110,7 +110,7 @@ static int sapi_servlet_ub_write(const char *str, uint str_length TSRMLS_DC) { if (!SG(server_context)) { - fprintf(stderr, str); + fprintf(stderr, "%s", str); return 0; }
-- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php