You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@httpd.apache.org by sf...@apache.org on 2012/01/09 14:06:18 UTC
svn commit: r1229134 - in /httpd/httpd/trunk/include: ap_config.h
http_protocol.h http_request.h httpd.h util_cookies.h util_filter.h
util_script.h
Author: sf
Date: Mon Jan 9 13:06:18 2012
New Revision: 1229134
URL: http://svn.apache.org/viewvc?rev=1229134&view=rev
Log:
Rename ap_func_attr_* macros to AP_FN_ATTR_*
Add macro for attribute alloc_size on newer gcc's
Modified:
httpd/httpd/trunk/include/ap_config.h
httpd/httpd/trunk/include/http_protocol.h
httpd/httpd/trunk/include/http_request.h
httpd/httpd/trunk/include/httpd.h
httpd/httpd/trunk/include/util_cookies.h
httpd/httpd/trunk/include/util_filter.h
httpd/httpd/trunk/include/util_script.h
Modified: httpd/httpd/trunk/include/ap_config.h
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/include/ap_config.h?rev=1229134&r1=1229133&r2=1229134&view=diff
==============================================================================
--- httpd/httpd/trunk/include/ap_config.h (original)
+++ httpd/httpd/trunk/include/ap_config.h Mon Jan 9 13:06:18 2012
@@ -223,17 +223,27 @@
#define __has_attribute(x) 0
#endif
#if (defined(__GNUC__) && __GNUC__ >= 4) || __has_attribute(sentinel)
-#define ap_func_attr_sentinel __attribute__((sentinel))
+#define AP_FN_ATTR_SENTINEL __attribute__((sentinel))
#else
-#define ap_func_attr_sentinel
+#define AP_FN_ATTR_SENTINEL
#endif
#if ( defined(__GNUC__) && \
(__GNUC__ >= 4 || ( __GNUC__ == 3 && __GNUC_MINOR__ >= 4))) \
|| __has_attribute(warn_unused_result)
-#define ap_func_attr_warn_unused_result __attribute__((warn_unused_result))
+#define AP_FN_ATTR_WARN_UNUSED_RESULT __attribute__((warn_unused_result))
#else
-#define ap_func_attr_warn_unused_result
+#define AP_FN_ATTR_WARN_UNUSED_RESULT
+#endif
+
+#if ( defined(__GNUC__) && \
+ (__GNUC__ >= 4 && __GNUC_MINOR__ >= 3)) \
+ || __has_attribute(alloc_size)
+#define AP_FN_ATTR_ALLOC_SIZE(x) __attribute__((alloc_size(x)))
+#define AP_FN_ATTR_ALLOC_SIZE2(x,y) __attribute__((alloc_size(x,y)))
+#else
+#define AP_FN_ATTR_ALLOC_SIZE(x)
+#define AP_FN_ATTR_ALLOC_SIZE2(x,y)
#endif
#endif /* AP_CONFIG_H */
Modified: httpd/httpd/trunk/include/http_protocol.h
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/include/http_protocol.h?rev=1229134&r1=1229133&r2=1229134&view=diff
==============================================================================
--- httpd/httpd/trunk/include/http_protocol.h (original)
+++ httpd/httpd/trunk/include/http_protocol.h Mon Jan 9 13:06:18 2012
@@ -355,7 +355,7 @@ static APR_INLINE int ap_rputs(const cha
* @return The number of bytes sent
*/
AP_DECLARE_NONSTD(int) ap_rvputs(request_rec *r,...)
- ap_func_attr_sentinel;
+ AP_FN_ATTR_SENTINEL;
/**
* Output data to the client in a printf format
Modified: httpd/httpd/trunk/include/http_request.h
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/include/http_request.h?rev=1229134&r1=1229133&r2=1229134&view=diff
==============================================================================
--- httpd/httpd/trunk/include/http_request.h (original)
+++ httpd/httpd/trunk/include/http_request.h Mon Jan 9 13:06:18 2012
@@ -285,7 +285,7 @@ AP_DECLARE(void) ap_update_mtime(request
* @return None.
*/
AP_DECLARE(void) ap_allow_methods(request_rec *r, int reset, ...)
- ap_func_attr_sentinel;
+ AP_FN_ATTR_SENTINEL;
/**
* Add one or more methods to the list permitted to access the resource.
Modified: httpd/httpd/trunk/include/httpd.h
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/include/httpd.h?rev=1229134&r1=1229133&r2=1229134&view=diff
==============================================================================
--- httpd/httpd/trunk/include/httpd.h (original)
+++ httpd/httpd/trunk/include/httpd.h Mon Jan 9 13:06:18 2012
@@ -2137,7 +2137,9 @@ AP_DECLARE(void) ap_abort_on_oom(void) _
* @return pointer to the allocated memory
* @note ap_malloc may be implemented as a macro
*/
-AP_DECLARE(void *) ap_malloc(size_t size) __attribute__((malloc));
+AP_DECLARE(void *) ap_malloc(size_t size)
+ __attribute__((malloc))
+ AP_FN_ATTR_ALLOC_SIZE(1);
/**
* Wrapper for calloc() that calls ap_abort_on_oom() if out of memory
@@ -2146,7 +2148,9 @@ AP_DECLARE(void *) ap_malloc(size_t size
* @return pointer to the allocated memory
* @note ap_calloc may be implemented as a macro
*/
-AP_DECLARE(void *) ap_calloc(size_t nelem, size_t size) __attribute__((malloc));
+AP_DECLARE(void *) ap_calloc(size_t nelem, size_t size)
+ __attribute__((malloc))
+ AP_FN_ATTR_ALLOC_SIZE2(1,2);
/**
* Wrapper for realloc() that calls ap_abort_on_oom() if out of memory
@@ -2156,7 +2160,8 @@ AP_DECLARE(void *) ap_calloc(size_t nele
* @note ap_realloc may be implemented as a macro
*/
AP_DECLARE(void *) ap_realloc(void *ptr, size_t size)
- ap_func_attr_warn_unused_result;
+ AP_FN_ATTR_WARN_UNUSED_RESULT
+ AP_FN_ATTR_ALLOC_SIZE2(1,2);
#define AP_NORESTART APR_OS_START_USEERR + 1
Modified: httpd/httpd/trunk/include/util_cookies.h
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/include/util_cookies.h?rev=1229134&r1=1229133&r2=1229134&view=diff
==============================================================================
--- httpd/httpd/trunk/include/util_cookies.h (original)
+++ httpd/httpd/trunk/include/util_cookies.h Mon Jan 9 13:06:18 2012
@@ -68,7 +68,7 @@ typedef struct {
AP_DECLARE(apr_status_t) ap_cookie_write(request_rec * r, const char *name,
const char *val, const char *attrs,
long maxage, ...)
- ap_func_attr_sentinel;
+ AP_FN_ATTR_SENTINEL;
/**
* Write an RFC2965 compliant cookie.
@@ -85,7 +85,7 @@ AP_DECLARE(apr_status_t) ap_cookie_write
AP_DECLARE(apr_status_t) ap_cookie_write2(request_rec * r, const char *name2,
const char *val, const char *attrs2,
long maxage, ...)
- ap_func_attr_sentinel;
+ AP_FN_ATTR_SENTINEL;
/**
* Remove an RFC2109 compliant cookie.
@@ -99,7 +99,7 @@ AP_DECLARE(apr_status_t) ap_cookie_write
*/
AP_DECLARE(apr_status_t) ap_cookie_remove(request_rec * r, const char *name,
const char *attrs, ...)
- ap_func_attr_sentinel;
+ AP_FN_ATTR_SENTINEL;
/**
* Remove an RFC2965 compliant cookie.
@@ -113,7 +113,7 @@ AP_DECLARE(apr_status_t) ap_cookie_remov
*/
AP_DECLARE(apr_status_t) ap_cookie_remove2(request_rec * r, const char *name2,
const char *attrs2, ...)
- ap_func_attr_sentinel;
+ AP_FN_ATTR_SENTINEL;
/**
* Read a cookie called name, placing its value in val.
Modified: httpd/httpd/trunk/include/util_filter.h
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/include/util_filter.h?rev=1229134&r1=1229133&r2=1229134&view=diff
==============================================================================
--- httpd/httpd/trunk/include/util_filter.h (original)
+++ httpd/httpd/trunk/include/util_filter.h Mon Jan 9 13:06:18 2012
@@ -568,7 +568,7 @@ AP_DECLARE(apr_status_t) ap_fflush(ap_fi
AP_DECLARE_NONSTD(apr_status_t) ap_fputstrs(ap_filter_t *f,
apr_bucket_brigade *bb,
...)
- ap_func_attr_sentinel;
+ AP_FN_ATTR_SENTINEL;
/**
* Output data to the filter in printf format
Modified: httpd/httpd/trunk/include/util_script.h
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/include/util_script.h?rev=1229134&r1=1229133&r2=1229134&view=diff
==============================================================================
--- httpd/httpd/trunk/include/util_script.h (original)
+++ httpd/httpd/trunk/include/util_script.h Mon Jan 9 13:06:18 2012
@@ -155,7 +155,7 @@ AP_DECLARE_NONSTD(int) ap_scan_script_he
char *buffer,
const char **termch,
int *termarg, ...)
- ap_func_attr_sentinel;
+ AP_FN_ATTR_SENTINEL;
/**
* Read headers strings from a script, ensuring that the output is valid. If
@@ -178,7 +178,7 @@ AP_DECLARE_NONSTD(int) ap_scan_script_he
int module_index,
const char **termch,
int *termarg, ...)
- ap_func_attr_sentinel;
+ AP_FN_ATTR_SENTINEL;
/**