diff options
| author | Nikita Popov <nikic@php.net> | 2014-09-03 15:22:08 +0200 |
|---|---|---|
| committer | Nikita Popov <nikic@php.net> | 2014-09-03 15:22:08 +0200 |
| commit | fdd1e96f3e90895134c4082bde8cad475378deac (patch) | |
| tree | 385a39da785e7265e265597b0c4ed2380147b70c /main/php.h | |
| parent | 9e753531842f524a1a147ca0244c041e59ecd117 (diff) | |
| download | php-git-fdd1e96f3e90895134c4082bde8cad475378deac.tar.gz | |
Revert "remove a few gcc format attributes from some printf-like functions"
This reverts commit 25f5ba94aca1e89ee5f0c66513e58826afa3b853.
Diffstat (limited to 'main/php.h')
| -rw-r--r-- | main/php.h | 14 |
1 files changed, 10 insertions, 4 deletions
diff --git a/main/php.h b/main/php.h index 47e1e10733..11a8a64401 100644 --- a/main/php.h +++ b/main/php.h @@ -281,9 +281,12 @@ ssize_t pread(int, void *, size_t, off64_t); BEGIN_EXTERN_C() void phperror(char *error); PHPAPI size_t php_write(void *buf, size_t size TSRMLS_DC); -PHPAPI size_t php_printf(const char *format, ...); +PHPAPI size_t php_printf(const char *format, ...) PHP_ATTRIBUTE_FORMAT(printf, 1, + 2); PHPAPI int php_get_module_initialized(void); PHPAPI void php_log_err(char *log_message TSRMLS_DC); +int Debug(char *format, ...) PHP_ATTRIBUTE_FORMAT(printf, 1, 2); +int cfgparse(void); END_EXTERN_C() #define php_error zend_error @@ -305,9 +308,12 @@ PHPAPI void php_verror(const char *docref, const char *params, int type, const c #endif /* PHPAPI void php_error(int type, const char *format, ...); */ -PHPAPI void php_error_docref0(const char *docref TSRMLS_DC, int type, const char *format, ...); -PHPAPI void php_error_docref1(const char *docref TSRMLS_DC, const char *param1, int type, const char *format, ...); -PHPAPI void php_error_docref2(const char *docref TSRMLS_DC, const char *param1, const char *param2, int type, const char *format, ...); +PHPAPI void php_error_docref0(const char *docref TSRMLS_DC, int type, const char *format, ...) + PHP_ATTRIBUTE_FORMAT(printf, PHP_ATTR_FMT_OFFSET + 3, PHP_ATTR_FMT_OFFSET + 4); +PHPAPI void php_error_docref1(const char *docref TSRMLS_DC, const char *param1, int type, const char *format, ...) + PHP_ATTRIBUTE_FORMAT(printf, PHP_ATTR_FMT_OFFSET + 4, PHP_ATTR_FMT_OFFSET + 5); +PHPAPI void php_error_docref2(const char *docref TSRMLS_DC, const char *param1, const char *param2, int type, const char *format, ...) + PHP_ATTRIBUTE_FORMAT(printf, PHP_ATTR_FMT_OFFSET + 5, PHP_ATTR_FMT_OFFSET + 6); #ifdef PHP_WIN32 PHPAPI void php_win32_docref2_from_error(DWORD error, const char *param1, const char *param2 TSRMLS_DC); #endif |