sesser Thu Mar 6 15:31:21 2003 EDT Modified files: /php4/ext/cyrus cyrus.c /php4/ext/db db.c /php4/ext/domxml php_domxml.c /php4/ext/fbsql php_fbsql.c /php4/ext/gd/libgd gdtestft.c /php4/ext/ming ming.c /php4/ext/msession msession.c /php4/ext/standard basic_functions.c file.c /php4/ext/xslt sablot.c /php4/ext/zlib zlib.c /php4/main main.c /php4/main/streams streams.c /php4/sapi/servlet servlet.c Log: Fixing functionicalls with variable number of parameters...
Index: php4/ext/cyrus/cyrus.c diff -u php4/ext/cyrus/cyrus.c:1.14 php4/ext/cyrus/cyrus.c:1.15 --- php4/ext/cyrus/cyrus.c:1.14 Sat Jan 18 16:31:04 2003 +++ php4/ext/cyrus/cyrus.c Thu Mar 6 15:31:14 2003 @@ -16,7 +16,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: cyrus.c,v 1.14 2003/01/18 21:31:04 iliaa Exp $ */ +/* $Id: cyrus.c,v 1.15 2003/03/06 20:31:14 sesser Exp $ */ #ifdef HAVE_CONFIG_H #include "config.h" @@ -110,7 +110,7 @@ { TSRMLS_FETCH(); - php_error_docref(NULL TSRMLS_CC, E_ERROR, s); + php_error_docref(NULL TSRMLS_CC, 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.84 php4/ext/db/db.c:1.85 --- php4/ext/db/db.c:1.84 Sat Jan 18 14:49:25 2003 +++ php4/ext/db/db.c Thu Mar 6 15:31:14 2003 @@ -17,7 +17,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: db.c,v 1.84 2003/01/18 19:49:25 iliaa Exp $ */ +/* $Id: db.c,v 1.85 2003/03/06 20:31:14 sesser Exp $ */ #define IS_EXT_MODULE #ifdef HAVE_CONFIG_H @@ -258,7 +258,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.237 php4/ext/domxml/php_domxml.c:1.238 --- php4/ext/domxml/php_domxml.c:1.237 Tue Mar 4 08:38:38 2003 +++ php4/ext/domxml/php_domxml.c Thu Mar 6 15:31:14 2003 @@ -16,7 +16,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: php_domxml.c,v 1.237 2003/03/04 13:38:38 chregu Exp $ */ +/* $Id: php_domxml.c,v 1.238 2003/03/06 20:31:14 sesser Exp $ */ /* TODO * - Support Notation Nodes @@ -1321,7 +1321,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, ...) @@ -1356,7 +1356,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); } @@ -1401,7 +1401,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.93 php4/ext/fbsql/php_fbsql.c:1.94 --- php4/ext/fbsql/php_fbsql.c:1.93 Sat Feb 15 22:48:44 2003 +++ php4/ext/fbsql/php_fbsql.c Thu Mar 6 15:31:15 2003 @@ -16,7 +16,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: php_fbsql.c,v 1.93 2003/02/16 03:48:44 wez Exp $ */ +/* $Id: php_fbsql.c,v 1.94 2003/03/06 20:31: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/gd/libgd/gdtestft.c diff -u php4/ext/gd/libgd/gdtestft.c:1.1 php4/ext/gd/libgd/gdtestft.c:1.2 --- php4/ext/gd/libgd/gdtestft.c:1.1 Fri Apr 12 22:03:09 2002 +++ php4/ext/gd/libgd/gdtestft.c Thu Mar 6 15:31:15 2003 @@ -60,7 +60,7 @@ err = gdImageStringFT ((gdImagePtr) NULL, &brect[0], 0, f, sz, angle, 0, 0, s); if (err) { - fprintf (stderr, err); + fprintf (stderr, "%s", err); return 1; } @@ -87,7 +87,7 @@ err = gdImageStringFT (im, NULL, black, f, sz, angle, x, y, s); if (err) { - fprintf (stderr, err); + fprintf (stderr, "%s", err); return 1; } /* TBB: Write img to test/fttest.png */ Index: php4/ext/ming/ming.c diff -u php4/ext/ming/ming.c:1.43 php4/ext/ming/ming.c:1.44 --- php4/ext/ming/ming.c:1.43 Tue Dec 31 11:06:57 2002 +++ php4/ext/ming/ming.c Thu Mar 6 15:31: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/msession/msession.c diff -u php4/ext/msession/msession.c:1.41 php4/ext/msession/msession.c:1.42 --- php4/ext/msession/msession.c:1.41 Mon Jan 20 11:15:16 2003 +++ php4/ext/msession/msession.c Thu Mar 6 15:31:16 2003 @@ -352,7 +352,7 @@ PHPExecRequest(REQ_DATASET, session,"",data,0); ret = (s_reqb->req.stat==REQ_OK); if(s_reqb->req.stat!=REQ_OK) - php_error_docref(NULL TSRMLS_CC, E_WARNING, ReqbErr(s_reqb)); + php_error_docref(NULL TSRMLS_CC, E_WARNING, "%s", ReqbErr(s_reqb)); return ret; @@ -367,7 +367,7 @@ PHPExecRequest( REQ_DROP, session, "","",0); ret = (s_reqb->req.stat==REQ_OK); if(s_reqb->req.stat!=REQ_OK) - php_error_docref(NULL TSRMLS_CC, E_WARNING, ReqbErr(s_reqb)); + php_error_docref(NULL TSRMLS_CC, E_WARNING, "%s", ReqbErr(s_reqb)); return ret; IFCONNECT_ENDVAL(0) @@ -454,7 +454,7 @@ } else { - php_error_docref(NULL TSRMLS_CC, E_WARNING, ReqbErr(s_reqb)); + php_error_docref(NULL TSRMLS_CC, E_WARNING, "%s", ReqbErr(s_reqb)); RETURN_FALSE; } IFCONNECT_END @@ -501,7 +501,7 @@ } else { - php_error_docref(NULL TSRMLS_CC, E_WARNING, ReqbErr(s_reqb)); + php_error_docref(NULL TSRMLS_CC, E_WARNING, "%s", ReqbErr(s_reqb)); RETURN_FALSE; } @@ -609,7 +609,7 @@ } else { - php_error_docref(NULL TSRMLS_CC, E_WARNING, ReqbErr(s_reqb)); + php_error_docref(NULL TSRMLS_CC, E_WARNING, "%s", ReqbErr(s_reqb)); RETURN_FALSE; } IFCONNECT_END @@ -649,7 +649,7 @@ } else { - php_error_docref(NULL TSRMLS_CC, E_WARNING, ReqbErr(s_reqb)); + php_error_docref(NULL TSRMLS_CC, E_WARNING, "%s", ReqbErr(s_reqb)); RETURN_FALSE; } IFCONNECT_END @@ -688,7 +688,7 @@ } else { - php_error_docref(NULL TSRMLS_CC, E_WARNING, ReqbErr(s_reqb)); + php_error_docref(NULL TSRMLS_CC, E_WARNING, "%s", ReqbErr(s_reqb)); RETURN_NULL(); } IFCONNECT_END @@ -720,7 +720,7 @@ } else { - php_error_docref(NULL TSRMLS_CC, E_WARNING, ReqbErr(s_reqb)); + php_error_docref(NULL TSRMLS_CC, E_WARNING, "%s", ReqbErr(s_reqb)); RETURN_NULL(); } IFCONNECT_END @@ -752,7 +752,7 @@ } else { - php_error_docref(NULL TSRMLS_CC, E_WARNING, ReqbErr(s_reqb)); + php_error_docref(NULL TSRMLS_CC, E_WARNING, "%s", ReqbErr(s_reqb)); RETURN_NULL(); } IFCONNECT_END @@ -797,7 +797,7 @@ } else if(s_reqb->req.stat != REQ_OK) { - php_error_docref(NULL TSRMLS_CC, E_WARNING, ReqbErr(s_reqb)); + php_error_docref(NULL TSRMLS_CC, E_WARNING, "%s", ReqbErr(s_reqb)); RETURN_NULL(); } IFCONNECT_END @@ -829,7 +829,7 @@ { /* May this should be an error? */ if(s_reqb->req.param != REQE_NOSESSION) - php_error_docref(NULL TSRMLS_CC, E_WARNING, ReqbErr(s_reqb)); + php_error_docref(NULL TSRMLS_CC, E_WARNING, "%s", ReqbErr(s_reqb)); RETURN_NULL(); } IFCONNECT_END @@ -879,7 +879,7 @@ else { if(s_reqb->req.param != REQE_NOSESSION) - php_error_docref(NULL TSRMLS_CC, E_WARNING, ReqbErr(s_reqb)); + php_error_docref(NULL TSRMLS_CC, E_WARNING, "%s", ReqbErr(s_reqb)); RETURN_NULL(); } IFCONNECT_END @@ -957,7 +957,7 @@ PHPExecRequestMulti(REQ_SETVAL, Z_STRVAL_PP(session), countpair, pairs,0); if(s_reqb->req.stat != REQ_OK) - php_error_docref(NULL TSRMLS_CC, E_WARNING, ReqbErr(s_reqb)); + php_error_docref(NULL TSRMLS_CC, E_WARNING, "%s", ReqbErr(s_reqb)); efree((void *)pairs); IFCONNECT_END } @@ -1003,7 +1003,7 @@ } else { - php_error_docref(NULL TSRMLS_CC, E_WARNING, ReqbErr(s_reqb)); + php_error_docref(NULL TSRMLS_CC, E_WARNING, "%s", ReqbErr(s_reqb)); RETURN_NULL(); } IFCONNECT_END @@ -1043,7 +1043,7 @@ } else { - php_error_docref(NULL TSRMLS_CC, E_WARNING, ReqbErr(s_reqb)); + php_error_docref(NULL TSRMLS_CC, E_WARNING, "%s", ReqbErr(s_reqb)); RETURN_NULL(); } IFCONNECT_END @@ -1075,7 +1075,7 @@ } else { - php_error_docref(NULL TSRMLS_CC, E_WARNING, ReqbErr(s_reqb)); + php_error_docref(NULL TSRMLS_CC, E_WARNING, "%s", ReqbErr(s_reqb)); RETURN_FALSE; } IFCONNECT_END @@ -1179,7 +1179,7 @@ } else if(s_reqb->req.stat != REQ_OK) { - php_error_docref(NULL TSRMLS_CC, E_WARNING, ReqbErr(s_reqb)); + php_error_docref(NULL TSRMLS_CC, E_WARNING, "%s", ReqbErr(s_reqb)); RETURN_FALSE; } @@ -1228,7 +1228,7 @@ } else if(s_reqb->req.stat != REQ_OK) { - php_error_docref(NULL TSRMLS_CC, E_WARNING, ReqbErr(s_reqb)); + php_error_docref(NULL TSRMLS_CC, E_WARNING, "%s", ReqbErr(s_reqb)); RETURN_FALSE; } IFCONNECT_END @@ -1257,7 +1257,7 @@ } else { - php_error_docref(NULL TSRMLS_CC, E_WARNING, ReqbErr(s_reqb)); + php_error_docref(NULL TSRMLS_CC, E_WARNING, "%s", ReqbErr(s_reqb)); RETURN_NULL(); } IFCONNECT_END @@ -1277,7 +1277,7 @@ } else { - php_error_docref(NULL TSRMLS_CC, E_WARNING, ReqbErr(s_reqb)); + php_error_docref(NULL TSRMLS_CC, E_WARNING, "%s", ReqbErr(s_reqb)); RETURN_FALSE; } IFCONNECT_END @@ -1372,7 +1372,7 @@ else { ELOG("Reports that UNIQ failed"); - php_error_docref(NULL TSRMLS_CC, E_WARNING, ReqbErr(s_reqb)); + php_error_docref(NULL TSRMLS_CC, E_WARNING, "%s", ReqbErr(s_reqb)); } } ELOG("Yikes, could not get sid from msession 2003"); Index: php4/ext/standard/basic_functions.c diff -u php4/ext/standard/basic_functions.c:1.593 php4/ext/standard/basic_functions.c:1.594 --- php4/ext/standard/basic_functions.c:1.593 Fri Feb 28 20:27:50 2003 +++ php4/ext/standard/basic_functions.c Thu Mar 6 15:31:16 2003 @@ -17,7 +17,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: basic_functions.c,v 1.593 2003/03/01 01:27:50 wez Exp $ */ +/* $Id: basic_functions.c,v 1.594 2003/03/06 20:31:16 sesser Exp $ */ #include "php.h" #include "php_streams.h" @@ -1965,7 +1965,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; @@ -2002,7 +2002,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/standard/file.c diff -u php4/ext/standard/file.c:1.322 php4/ext/standard/file.c:1.323 --- php4/ext/standard/file.c:1.322 Fri Feb 28 14:53:20 2003 +++ php4/ext/standard/file.c Thu Mar 6 15:31:17 2003 @@ -21,7 +21,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: file.c,v 1.322 2003/02/28 19:53:20 wez Exp $ */ +/* $Id: file.c,v 1.323 2003/03/06 20:31:17 sesser Exp $ */ /* Synced with php 3.0 revision 1.218 1999-06-16 [ssb] */ @@ -1136,7 +1136,7 @@ } if ((ret = VCWD_MKDIR(dir, (mode_t)mode)) < 0) { - php_error_docref(NULL TSRMLS_CC, E_WARNING, strerror(errno)); + php_error_docref(NULL TSRMLS_CC, E_WARNING, "%s", strerror(errno)); } return ret; @@ -1185,7 +1185,7 @@ if (*p == '\0' && *(p + 1) != '\0') { *p = DEFAULT_SLASH; if ((ret = VCWD_MKDIR(buf, (mode_t)mode)) < 0) { - php_error_docref(NULL TSRMLS_CC, E_WARNING, strerror(errno)); + php_error_docref(NULL TSRMLS_CC, E_WARNING, "%s", strerror(errno)); break; } } Index: php4/ext/xslt/sablot.c diff -u php4/ext/xslt/sablot.c:1.72 php4/ext/xslt/sablot.c:1.73 --- php4/ext/xslt/sablot.c:1.72 Sat Jan 18 16:31:08 2003 +++ php4/ext/xslt/sablot.c Thu Mar 6 15:31:17 2003 @@ -19,7 +19,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: sablot.c,v 1.72 2003/01/18 21:31:08 iliaa Exp $ */ +/* $Id: sablot.c,v 1.73 2003/03/06 20:31:17 sesser Exp $ */ #ifdef HAVE_CONFIG_H #include "config.h" @@ -1797,7 +1797,7 @@ XSLT_REG_ERRMSG(errmsg, handle); /* Output a warning */ - php_error_docref(NULL TSRMLS_CC, E_WARNING, msgbuf); + php_error_docref(NULL TSRMLS_CC, E_WARNING, "%s", msgbuf); /* Cleanup */ efree(msgbuf); Index: php4/ext/zlib/zlib.c diff -u php4/ext/zlib/zlib.c:1.163 php4/ext/zlib/zlib.c:1.164 --- php4/ext/zlib/zlib.c:1.163 Mon Feb 17 08:29:58 2003 +++ php4/ext/zlib/zlib.c Thu Mar 6 15:31:18 2003 @@ -18,7 +18,7 @@ | Jade Nicoletti <[EMAIL PROTECTED]> | +----------------------------------------------------------------------+ */ -/* $Id: zlib.c,v 1.163 2003/02/17 13:29:58 zeev Exp $ */ +/* $Id: zlib.c,v 1.164 2003/03/06 20:31:18 sesser Exp $ */ #define IS_EXT_MODULE #ifdef HAVE_CONFIG_H @@ -446,7 +446,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; } } @@ -502,7 +502,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; } } @@ -572,7 +572,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; } } @@ -654,7 +654,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; } } @@ -850,14 +850,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; @@ -895,7 +895,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.534 php4/main/main.c:1.535 --- php4/main/main.c:1.534 Tue Mar 4 09:12:39 2003 +++ php4/main/main.c Thu Mar 6 15:31:19 2003 @@ -18,7 +18,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: main.c,v 1.534 2003/03/04 14:12:39 sniper Exp $ */ +/* $Id: main.c,v 1.535 2003/03/06 20:31:19 sesser Exp $ */ /* {{{ includes */ @@ -839,7 +839,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/streams.c diff -u php4/main/streams/streams.c:1.7 php4/main/streams/streams.c:1.8 --- php4/main/streams/streams.c:1.7 Thu Feb 27 12:43:38 2003 +++ php4/main/streams/streams.c Thu Mar 6 15:31:20 2003 @@ -19,7 +19,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: streams.c,v 1.7 2003/02/27 17:43:38 wez Exp $ */ +/* $Id: streams.c,v 1.8 2003/03/06 20:31:20 sesser Exp $ */ #define _GNU_SOURCE #include "php.h" @@ -174,7 +174,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 */ @@ -341,7 +341,7 @@ # if defined(PHP_WIN32) OutputDebugString(leakbuf); # else - fprintf(stderr, leakbuf); + fprintf(stderr, "%s", leakbuf); # endif } else { STR_FREE(stream->__orig_path); Index: php4/sapi/servlet/servlet.c diff -u php4/sapi/servlet/servlet.c:1.69 php4/sapi/servlet/servlet.c:1.70 --- php4/sapi/servlet/servlet.c:1.69 Sun Jan 12 03:03:17 2003 +++ php4/sapi/servlet/servlet.c Thu Mar 6 15:31:20 2003 @@ -109,7 +109,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