VladPolskiy/apache_httpd
1
0
Fork 0
mirror of https://github.com/apache/httpd.git synced 2025-08-15 22:19:58 +00:00
Code Issues Packages Projects Releases Wiki Activity

Rename ap_func_attr_* macros to AP_FN_ATTR_*

Browse Source 
Add macro for attribute alloc_size on newer gcc's


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1229134 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Stefan Fritsch
2012-01-09 13:06:18 +00:00
parent d00d15ac35
commit 75dad9d44f
7 changed files with 31 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
include/ap_config.h
View File

@ -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 */

2
include/http_protocol.h
View File

@ -355,7 +355,7 @@ static APR_INLINE int ap_rputs(const char *str, request_rec *r)
* @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

2
include/http_request.h
View File

@ -285,7 +285,7 @@ AP_DECLARE(void) ap_update_mtime(request_rec *r, apr_time_t dependency_mtime);
* @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.

11
include/httpd.h
View File

@ -2137,7 +2137,9 @@ AP_DECLARE(void) ap_abort_on_oom(void) __attribute__((noreturn));
* @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) __attribute__((malloc));
* @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 nelem, size_t size) __attribute__((malloc));
* @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

8
include/util_cookies.h
View File

@ -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(request_rec * r, const char *name,
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_write2(request_rec * r, const char *name2,
*/
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_remove(request_rec * r, const char *name,
*/
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.

2
include/util_filter.h
View File

@ -568,7 +568,7 @@ AP_DECLARE(apr_status_t) ap_fflush(ap_filter_t *f, apr_bucket_brigade *bb);
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

4
include/util_script.h
View File

@ -155,7 +155,7 @@ AP_DECLARE_NONSTD(int) ap_scan_script_header_err_strs(request_rec *r,
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_header_err_strs_ex(request_rec *r,
int module_index,
const char **termch,
int *termarg, ...)
ap_func_attr_sentinel;
AP_FN_ATTR_SENTINEL;
/**