FAQ
Commit: 25f5ba94aca1e89ee5f0c66513e58826afa3b853
Author: Nuno Lopes <nlopess@php.net> Sun, 31 Aug 2014 11:45:11 -0400
Parents: 51ce4bd87c4f47150cf2edcf3b6ac0534a462666
Branches: master

Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=25f5ba94aca1e89ee5f0c66513e58826afa3b853

Log:
remove a few gcc format attributes from some printf-like functions
Since now PHP's printf-like functions have many custom specifiers, the amount of false-positives wasnt worth it

Changed paths:
   M main/php.h
   M main/php_streams.h
   M main/snprintf.h
   M main/spprintf.h


Diff:
diff --git a/main/php.h b/main/php.h
index 11a8a64..47e1e10 100644
--- a/main/php.h
+++ b/main/php.h
@@ -281,12 +281,9 @@ 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, ...) PHP_ATTRIBUTE_FORMAT(printf, 1,
- 2);
+PHPAPI size_t php_printf(const char *format, ...);
  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
@@ -308,12 +305,9 @@ 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, ...)
- 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);
+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, ...);
  #ifdef PHP_WIN32
  PHPAPI void php_win32_docref2_from_error(DWORD error, const char *param1, const char *param2 TSRMLS_DC);
  #endif
diff --git a/main/php_streams.h b/main/php_streams.h
index 9a6e84d..ecc6557 100644
--- a/main/php_streams.h
+++ b/main/php_streams.h
@@ -299,9 +299,9 @@ PHPAPI void _php_stream_fill_read_buffer(php_stream *stream, size_t size TSRMLS_
  #define php_stream_fill_read_buffer(stream, size) _php_stream_fill_read_buffer((stream), (size) TSRMLS_CC)

  #ifdef ZTS
-PHPAPI size_t _php_stream_printf(php_stream *stream TSRMLS_DC, const char *fmt, ...) PHP_ATTRIBUTE_FORMAT(printf, 3, 4);
+PHPAPI size_t _php_stream_printf(php_stream *stream TSRMLS_DC, const char *fmt, ...);
  #else
-PHPAPI size_t _php_stream_printf(php_stream *stream TSRMLS_DC, const char *fmt, ...) PHP_ATTRIBUTE_FORMAT(printf, 2, 3);
+PHPAPI size_t _php_stream_printf(php_stream *stream TSRMLS_DC, const char *fmt, ...);
  #endif

  /* php_stream_printf macro & function require TSRMLS_CC */
@@ -560,9 +560,9 @@ PHPAPI const char *php_stream_locate_eol(php_stream *stream, zend_string *buf TS

  /* pushes an error message onto the stack for a wrapper instance */
  #ifdef ZTS
-PHPAPI void php_stream_wrapper_log_error(php_stream_wrapper *wrapper, int options TSRMLS_DC, const char *fmt, ...) PHP_ATTRIBUTE_FORMAT(printf, 4, 5);
+PHPAPI void php_stream_wrapper_log_error(php_stream_wrapper *wrapper, int options TSRMLS_DC, const char *fmt, ...);
  #else
-PHPAPI void php_stream_wrapper_log_error(php_stream_wrapper *wrapper, int options TSRMLS_DC, const char *fmt, ...) PHP_ATTRIBUTE_FORMAT(printf, 3, 4);
+PHPAPI void php_stream_wrapper_log_error(php_stream_wrapper *wrapper, int options TSRMLS_DC, const char *fmt, ...);
  #endif

  #define PHP_STREAM_UNCHANGED 0 /* orig stream was seekable anyway */
diff --git a/main/snprintf.h b/main/snprintf.h
index 6cef41f..98742e0 100644
--- a/main/snprintf.h
+++ b/main/snprintf.h
@@ -84,7 +84,7 @@ PHPAPI int ap_php_snprintf(char *, size_t, const char *, ...);
  PHPAPI int ap_php_vsnprintf(char *, size_t, const char *, va_list ap);
  PHPAPI int ap_php_vasprintf(char **buf, const char *format, va_list ap);
  PHPAPI int ap_php_asprintf(char **buf, const char *format, ...);
-PHPAPI int php_sprintf (char* s, const char* format, ...) PHP_ATTRIBUTE_FORMAT(printf, 2, 3);
+PHPAPI int php_sprintf (char* s, const char* format, ...);
  PHPAPI char * php_gcvt(double value, int ndigit, char dec_point, char exponent, char *buf);
  PHPAPI char * php_conv_fp(register char format, register double num,
     boolean_e add_dp, int precision, char dec_point, bool_int * is_negative, char *buf, size_t *len);
diff --git a/main/spprintf.h b/main/spprintf.h
index 1e47828..70e4b0d 100644
--- a/main/spprintf.h
+++ b/main/spprintf.h
@@ -37,9 +37,9 @@ There is also snprintf: See difference explained in snprintf.h
  #include "snprintf.h"

  BEGIN_EXTERN_C()
-PHPAPI size_t spprintf( char **pbuf, size_t max_len, const char *format, ...) PHP_ATTRIBUTE_FORMAT(printf, 3, 4);
+PHPAPI size_t spprintf( char **pbuf, size_t max_len, const char *format, ...);

-PHPAPI size_t vspprintf(char **pbuf, size_t max_len, const char *format, va_list ap) PHP_ATTRIBUTE_FORMAT(printf, 3, 0);
+PHPAPI size_t vspprintf(char **pbuf, size_t max_len, const char *format, va_list ap);

  PHPAPI zend_string *vstrpprintf(size_t max_len, const char *format, va_list ap);

Search Discussions

Related Discussions

Discussion Navigation
viewthread | post
posts ‹ prev | 1 of 1 | next ›
Discussion Overview
groupphp-cvs @
categoriesphp
postedAug 31, '14 at 3:45p
activeAug 31, '14 at 3:45p
posts1
users1
websitephp.net

1 user in discussion

Nuno Lopes: 1 post

People

Translate

site design / logo © 2017 Grokbase