archive/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2025-08-16 05:58:45 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

Fixing functionicalls with variable number of parameters...

Browse source
This commit is contained in:
Stefan Esser 2003-03-06 20:31:20 +00:00
parent 2d40fe2222
commit af4aa97d1e
14 changed files with 47 additions and 47 deletions
Download patch file Download diff file Expand all files Collapse all files

2
ext/cyrus/cyrus.c
View file

@ -110,7 +110,7 @@ extern void fatal(char *s, int exit)
{
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]]])

2
ext/db/db.c
View file

@ -258,7 +258,7 @@ PHP_MINFO_FUNCTION(db)
{
/* 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();
}
/* }}} */

6
ext/domxml/php_domxml.c
View file

@ -1321,7 +1321,7 @@ static void domxml_error(void *ctx, const char *msg, ...)
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 @@ static void domxml_error_ext(void *ctx, const char *msg, ...)
}
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 @@ static void domxml_error_validate(void *ctx, const char *msg, ...)
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);
}

4
ext/fbsql/php_fbsql.c
View file

@ -735,7 +735,7 @@ static int php_fbsql_select_db(char *databaseName, PHPFBLink *link TSRMLS_DC)
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 @@ static int php_fbsql_select_db(char *databaseName, PHPFBLink *link TSRMLS_DC)
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");
}

4
ext/gd/libgd/gdtestft.c
View file

@ -60,7 +60,7 @@ main (int argc, char *argv[])
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 @@ main (int argc, char *argv[])
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 */

2
ext/ming/ming.c
View file

@ -2725,7 +2725,7 @@ static void php_ming_error(char *msg, ...)
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);
}

42
ext/msession/msession.c
View file

@ -352,7 +352,7 @@ int PHPMsessionSetData(char *session, char *data TSRMLS_DC)
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 @@ int PHPMsessionDestroy(char *session TSRMLS_DC)
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 @@ PHP_FUNCTION(msession_create)
}
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 @@ PHP_FUNCTION(msession_lock)
}
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 @@ PHP_FUNCTION(msession_unlock)
}
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 @@ PHP_FUNCTION(msession_set)
}
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 @@ PHP_FUNCTION(msession_get)
}
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 @@ PHP_FUNCTION(msession_uniq)
}
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 @@ PHP_FUNCTION(msession_randstr)
}
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 @@ PHP_FUNCTION(msession_find)
}
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 @@ PHP_FUNCTION(msession_list)
{
/* 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 @@ PHP_FUNCTION(msession_get_array)
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 @@ PHP_FUNCTION(msession_set_array)
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 @@ PHP_FUNCTION(msession_listvar)
}
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 @@ PHP_FUNCTION(msession_timeout)
}
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 @@ PHP_FUNCTION(msession_inc)
}
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 @@ PHP_FUNCTION(msession_plugin)
}
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 @@ PHP_FUNCTION(msession_call)
}
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 @@ PHP_FUNCTION(msession_exec)
}
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 @@ PHP_FUNCTION(msession_ping)
}
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 @@ PS_CREATE_SID_FUNC(msession)
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");

4
ext/standard/basic_functions.c
View file

@ -1965,7 +1965,7 @@ PHP_FUNCTION(call_user_method)
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 @@ PHP_FUNCTION(call_user_method_array)
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, &params) == FAILURE) {
WRONG_PARAM_COUNT;

4
ext/standard/file.c
View file

@ -1136,7 +1136,7 @@ PHPAPI int php_mkdir(char *dir, long mode TSRMLS_DC)
}
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 @@ PHP_FUNCTION(mkdir)
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;
}
}

2
ext/xslt/sablot.c
View file

@ -1797,7 +1797,7 @@ static MH_ERROR error_print(void *user_data, SablotHandle proc, MH_ERROR code, M
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);

14
ext/zlib/zlib.c
View file

@ -446,7 +446,7 @@ PHP_FUNCTION(gzcompress)
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 @@ PHP_FUNCTION(gzuncompress)
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 @@ PHP_FUNCTION(gzdeflate)
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 @@ PHP_FUNCTION(gzinflate)
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 @@ PHP_FUNCTION(gzencode)
-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 @@ PHP_FUNCTION(gzencode)
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;
}
}

2
main/main.c
View file

@ -839,7 +839,7 @@ static void php_message_handler_for_zend(long message, void *data)
# if defined(PHP_WIN32)
OutputDebugString(memory_leak_buf);
# else
fprintf(stderr, memory_leak_buf);
fprintf(stderr, "%s", memory_leak_buf);
# endif
#endif
}

4
main/streams/streams.c
View file

@ -174,7 +174,7 @@ PHPAPI void php_stream_wrapper_log_error(php_stream_wrapper *wrapper, int option
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 @@ fprintf(stderr, "stream_free: %s:%p[%s] preserve_handle=%d release_cast=%d remov
# if defined(PHP_WIN32)
OutputDebugString(leakbuf);
# else
fprintf(stderr, leakbuf);
fprintf(stderr, "%s", leakbuf);
# endif
} else {
STR_FREE(stream->__orig_path);

2
sapi/servlet/servlet.c
View file

@ -109,7 +109,7 @@ void ThrowServletException (JNIEnv *jenv, char *msg) {
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;
}