diff options
Diffstat (limited to 'include/asterisk')
-rw-r--r-- | include/asterisk/astmm.h | 4 | ||||
-rw-r--r-- | include/asterisk/channel.h | 10 | ||||
-rw-r--r-- | include/asterisk/cli.h | 2 | ||||
-rw-r--r-- | include/asterisk/compat.h | 4 | ||||
-rw-r--r-- | include/asterisk/config.h | 2 | ||||
-rw-r--r-- | include/asterisk/devicestate.h | 8 | ||||
-rw-r--r-- | include/asterisk/dlinkedlists.h | 8 | ||||
-rw-r--r-- | include/asterisk/dundi.h | 14 | ||||
-rw-r--r-- | include/asterisk/enum.h | 2 | ||||
-rw-r--r-- | include/asterisk/linkedlists.h | 8 | ||||
-rw-r--r-- | include/asterisk/lock.h | 8 | ||||
-rw-r--r-- | include/asterisk/logger.h | 13 | ||||
-rw-r--r-- | include/asterisk/manager.h | 4 | ||||
-rw-r--r-- | include/asterisk/module.h | 8 | ||||
-rw-r--r-- | include/asterisk/res_odbc.h | 2 | ||||
-rw-r--r-- | include/asterisk/stringfields.h | 4 | ||||
-rw-r--r-- | include/asterisk/strings.h | 16 | ||||
-rw-r--r-- | include/asterisk/utils.h | 6 |
18 files changed, 60 insertions, 63 deletions
diff --git a/include/asterisk/astmm.h b/include/asterisk/astmm.h index 5d0d47ff5..553587942 100644 --- a/include/asterisk/astmm.h +++ b/include/asterisk/astmm.h @@ -51,9 +51,9 @@ void *__ast_realloc(void *ptr, size_t size, const char *file, int lineno, const char *__ast_strdup(const char *s, const char *file, int lineno, const char *func); char *__ast_strndup(const char *s, size_t n, const char *file, int lineno, const char *func); int __ast_asprintf(const char *file, int lineno, const char *func, char **strp, const char *format, ...) - __attribute__ ((format (printf, 5, 6))); + __attribute__((format(printf, 5, 6))); int __ast_vasprintf(char **strp, const char *format, va_list ap, const char *file, int lineno, const char *func) - __attribute__ ((format (printf, 2, 0))); + __attribute__((format(printf, 2, 0))); void __ast_mm_init(void); diff --git a/include/asterisk/channel.h b/include/asterisk/channel.h index 2c2cad6cf..ae785a298 100644 --- a/include/asterisk/channel.h +++ b/include/asterisk/channel.h @@ -644,14 +644,14 @@ enum channelreloadreason { * \deprecated You should use the ast_datastore_alloc() generic function instead. */ struct ast_datastore *ast_channel_datastore_alloc(const struct ast_datastore_info *info, const char *uid) - __attribute__ ((deprecated)); + __attribute__((deprecated)); /*! * \brief Free a channel data store object * \deprecated You should use the ast_datastore_free() generic function instead. */ int ast_channel_datastore_free(struct ast_datastore *datastore) - __attribute__ ((deprecated)); + __attribute__((deprecated)); /*! \brief Inherit datastores from a parent to a child. */ int ast_channel_datastore_inherit(struct ast_channel *from, struct ast_channel *to); @@ -702,7 +702,7 @@ int ast_setstate(struct ast_channel *chan, enum ast_channel_state); * \note By default, new channels are set to the "s" extension * and "default" context. */ -struct ast_channel *ast_channel_alloc(int needqueue, int state, const char *cid_num, const char *cid_name, const char *acctcode, const char *exten, const char *context, const int amaflag, const char *name_fmt, ...); +struct ast_channel *ast_channel_alloc(int needqueue, int state, const char *cid_num, const char *cid_name, const char *acctcode, const char *exten, const char *context, const int amaflag, const char *name_fmt, ...) __attribute__((format(printf, 9, 10))); /*! * \brief Queue an outgoing frame @@ -921,7 +921,7 @@ int ast_check_hangup(struct ast_channel *chan); * is earlier than current time plus the offset, it returns 1, if the two * time values are equal, it return 0, otherwise, it return -1. */ -int ast_channel_cmpwhentohangup(struct ast_channel *chan, time_t offset) __attribute__ ((deprecated)); +int ast_channel_cmpwhentohangup(struct ast_channel *chan, time_t offset) __attribute__((deprecated)); int ast_channel_cmpwhentohangup_tv(struct ast_channel *chan, struct timeval offset); /*! \brief Set when to hang a channel up @@ -936,7 +936,7 @@ int ast_channel_cmpwhentohangup_tv(struct ast_channel *chan, struct timeval offs * * \return Nothing */ -void ast_channel_setwhentohangup(struct ast_channel *chan, time_t offset) __attribute__ ((deprecated)); +void ast_channel_setwhentohangup(struct ast_channel *chan, time_t offset) __attribute__((deprecated)); void ast_channel_setwhentohangup_tv(struct ast_channel *chan, struct timeval offset); /*! diff --git a/include/asterisk/cli.h b/include/asterisk/cli.h index 8b337aea1..535b4e6af 100644 --- a/include/asterisk/cli.h +++ b/include/asterisk/cli.h @@ -30,7 +30,7 @@ extern "C" { #include "asterisk/linkedlists.h" void ast_cli(int fd, const char *fmt, ...) - __attribute__ ((format (printf, 2, 3))); + __attribute__((format(printf, 2, 3))); #define RESULT_SUCCESS 0 #define RESULT_SHOWUSAGE 1 diff --git a/include/asterisk/compat.h b/include/asterisk/compat.h index 0b431f5e0..572bb145b 100644 --- a/include/asterisk/compat.h +++ b/include/asterisk/compat.h @@ -74,7 +74,7 @@ #endif #if !defined(HAVE_ASPRINTF) && !defined(__AST_DEBUG_MALLOC) -int __attribute__ ((format (printf, 2, 3))) asprintf(char **str, const char *fmt, ...); +int __attribute__((format(printf, 2, 3))) asprintf(char **str, const char *fmt, ...); #endif #ifndef HAVE_GETLOADAVG @@ -110,7 +110,7 @@ int unsetenv(const char *name); #endif #if !defined(HAVE_VASPRINTF) && !defined(__AST_DEBUG_MALLOC) -int __attribute__ ((format (printf, 2, 0))) vasprintf(char **strp, const char *fmt, va_list ap); +int __attribute__((format(printf, 2, 0))) vasprintf(char **strp, const char *fmt, va_list ap); #endif #ifndef HAVE_STRLCAT diff --git a/include/asterisk/config.h b/include/asterisk/config.h index 15157e239..b1177317c 100644 --- a/include/asterisk/config.h +++ b/include/asterisk/config.h @@ -389,7 +389,7 @@ int ast_variable_update(struct ast_category *category, const char *variable, const char *value, const char *match, unsigned int object); int ast_config_text_file_save(const char *filename, const struct ast_config *cfg, const char *generator); -int config_text_file_save(const char *filename, const struct ast_config *cfg, const char *generator) __attribute__ ((deprecated)); +int config_text_file_save(const char *filename, const struct ast_config *cfg, const char *generator) __attribute__((deprecated)); struct ast_config *ast_config_internal_load(const char *configfile, struct ast_config *cfg, struct ast_flags flags, const char *suggested_incl_file, const char *who_asked); diff --git a/include/asterisk/devicestate.h b/include/asterisk/devicestate.h index bacf54648..839272732 100644 --- a/include/asterisk/devicestate.h +++ b/include/asterisk/devicestate.h @@ -73,7 +73,7 @@ enum ast_device_state ast_state_chan2dev(enum ast_channel_state chanstate); * * \param devstate Current device state */ -const char *devstate2str(enum ast_device_state devstate) attribute_pure __attribute__ ((deprecated)); +const char *devstate2str(enum ast_device_state devstate) attribute_pure __attribute__((deprecated)); const char *ast_devstate2str(enum ast_device_state devstate) attribute_pure; /*! @@ -135,7 +135,7 @@ enum ast_device_state ast_device_state(const char *device); * \retval -1 on failure */ int ast_devstate_changed(enum ast_device_state state, const char *fmt, ...) - __attribute__ ((format (printf, 2, 3))); + __attribute__((format(printf, 2, 3))); /*! * \brief Tells Asterisk the State for Device is changed @@ -166,7 +166,7 @@ int ast_devstate_changed_literal(enum ast_device_state state, const char *device * \note This is deprecated in favor of ast_devstate_changed() */ int ast_device_state_changed(const char *fmt, ...) - __attribute__ ((deprecated,format (printf, 1, 2))); + __attribute__((deprecated,format(printf, 1, 2))); /*! * \brief Tells Asterisk the State for Device is changed @@ -182,7 +182,7 @@ int ast_device_state_changed(const char *fmt, ...) * \note This is deprecated in favor of ast_devstate_changed_literal() */ int ast_device_state_changed_literal(const char *device) - __attribute__ ((deprecated)); + __attribute__((deprecated)); /*! * \brief Add device state provider diff --git a/include/asterisk/dlinkedlists.h b/include/asterisk/dlinkedlists.h index 2f42fdd39..17bd7a43c 100644 --- a/include/asterisk/dlinkedlists.h +++ b/include/asterisk/dlinkedlists.h @@ -253,11 +253,11 @@ struct name { \ struct type *last; \ ast_mutex_t lock; \ } name; \ -static void __attribute__ ((constructor)) __init_##name(void) \ +static void __attribute__((constructor)) __init_##name(void) \ { \ AST_DLLIST_HEAD_INIT(&name); \ } \ -static void __attribute__ ((destructor)) __fini_##name(void) \ +static void __attribute__((destructor)) __fini_##name(void) \ { \ AST_DLLIST_HEAD_DESTROY(&name); \ } \ @@ -295,11 +295,11 @@ struct name { \ struct type *last; \ ast_rwlock_t lock; \ } name; \ -static void __attribute__ ((constructor)) __init_##name(void) \ +static void __attribute__((constructor)) __init_##name(void) \ { \ AST_RWDLLIST_HEAD_INIT(&name); \ } \ -static void __attribute__ ((destructor)) __fini_##name(void) \ +static void __attribute__((destructor)) __fini_##name(void) \ { \ AST_RWDLLIST_HEAD_DESTROY(&name); \ } \ diff --git a/include/asterisk/dundi.h b/include/asterisk/dundi.h index c2a85493e..2bffd0246 100644 --- a/include/asterisk/dundi.h +++ b/include/asterisk/dundi.h @@ -39,13 +39,13 @@ struct dundi_hdr { unsigned char cmdresp; /*!< Command / Response */ unsigned char cmdflags; /*!< Command / Response specific flags*/ unsigned char ies[0]; -} __attribute__ ((__packed__)); +} __attribute__((__packed__)); struct dundi_ie_hdr { unsigned char ie; unsigned char len; unsigned char iedata[0]; -} __attribute__ ((__packed__)); +} __attribute__((__packed__)); #define DUNDI_FLAG_RETRANS (1 << 16) /*!< Applies to dtrans */ #define DUNDI_FLAG_RESERVED (1 << 16) /*!< Applies to strans */ @@ -97,7 +97,7 @@ enum { struct dundi_encblock { /*!< AES-128 encrypted block */ unsigned char iv[16]; /*!< Initialization vector of random data */ unsigned char encdata[0]; /*!< Encrypted / compressed data */ -} __attribute__ ((__packed__)); +} __attribute__((__packed__)); struct dundi_answer { dundi_eid eid; /*!< Original source of answer */ @@ -105,12 +105,12 @@ struct dundi_answer { unsigned short flags; /*!< Flags relating to answer */ unsigned short weight; /*!< Weight of answers */ unsigned char data[0]; /*!< Protocol specific URI */ -} __attribute__ ((__packed__)); +} __attribute__((__packed__)); struct dundi_hint { unsigned short flags; /*!< Flags relating to answer */ unsigned char data[0]; /*!< For data for hint */ -} __attribute__ ((__packed__)); +} __attribute__((__packed__)); enum { /*! Success */ @@ -134,14 +134,14 @@ enum { struct dundi_cause { unsigned char causecode; /*!< Numerical cause (DUNDI_CAUSE_*) */ char desc[0]; /*!< Textual description */ -} __attribute__ ((__packed__)); +} __attribute__((__packed__)); struct dundi_peer_status { unsigned int flags; unsigned short netlag; unsigned short querylag; dundi_eid peereid; -} __attribute__ ((__packed__)); +} __attribute__((__packed__)); enum { DUNDI_PEER_PRIMARY = (1 << 0), diff --git a/include/asterisk/enum.h b/include/asterisk/enum.h index 499e34673..d19368905 100644 --- a/include/asterisk/enum.h +++ b/include/asterisk/enum.h @@ -28,7 +28,7 @@ struct naptr { unsigned short order; unsigned short pref; -} __attribute__ ((__packed__)); +} __attribute__((__packed__)); struct enum_naptr_rr { struct naptr naptr; /*!< order and preference of RR */ diff --git a/include/asterisk/linkedlists.h b/include/asterisk/linkedlists.h index 5e8f70c34..f49150a50 100644 --- a/include/asterisk/linkedlists.h +++ b/include/asterisk/linkedlists.h @@ -248,11 +248,11 @@ struct name { \ struct type *last; \ ast_mutex_t lock; \ } name; \ -static void __attribute__ ((constructor)) __init_##name(void) \ +static void __attribute__((constructor)) __init_##name(void) \ { \ AST_LIST_HEAD_INIT(&name); \ } \ -static void __attribute__ ((destructor)) __fini_##name(void) \ +static void __attribute__((destructor)) __fini_##name(void) \ { \ AST_LIST_HEAD_DESTROY(&name); \ } \ @@ -290,11 +290,11 @@ struct name { \ struct type *last; \ ast_rwlock_t lock; \ } name; \ -static void __attribute__ ((constructor)) __init_##name(void) \ +static void __attribute__((constructor)) __init_##name(void) \ { \ AST_RWLIST_HEAD_INIT(&name); \ } \ -static void __attribute__ ((destructor)) __fini_##name(void) \ +static void __attribute__((destructor)) __fini_##name(void) \ { \ AST_RWLIST_HEAD_DESTROY(&name); \ } \ diff --git a/include/asterisk/lock.h b/include/asterisk/lock.h index ae81fe46e..8b48da9b2 100644 --- a/include/asterisk/lock.h +++ b/include/asterisk/lock.h @@ -1622,7 +1622,7 @@ static inline int ast_rwlock_trywrlock(ast_rwlock_t *prwlock) */ #define __AST_MUTEX_DEFINE(scope, mutex, init_val, track) \ scope ast_mutex_t mutex = init_val; \ -static void __attribute__ ((constructor)) init_##mutex(void) \ +static void __attribute__((constructor)) init_##mutex(void) \ { \ if (track) \ ast_mutex_init(&mutex); \ @@ -1630,7 +1630,7 @@ static void __attribute__ ((constructor)) init_##mutex(void) \ ast_mutex_init_notracking(&mutex); \ } \ \ -static void __attribute__ ((destructor)) fini_##mutex(void) \ +static void __attribute__((destructor)) fini_##mutex(void) \ { \ ast_mutex_destroy(&mutex); \ } @@ -1671,14 +1671,14 @@ static void __attribute__ ((destructor)) fini_##mutex(void) \ #ifdef AST_MUTEX_INIT_W_CONSTRUCTORS #define __AST_RWLOCK_DEFINE(scope, rwlock, init_val, track) \ scope ast_rwlock_t rwlock = init_val; \ -static void __attribute__ ((constructor)) init_##rwlock(void) \ +static void __attribute__((constructor)) init_##rwlock(void) \ { \ if (track) \ ast_rwlock_init(&rwlock); \ else \ ast_rwlock_init_notracking(&rwlock); \ } \ -static void __attribute__ ((destructor)) fini_##rwlock(void) \ +static void __attribute__((destructor)) fini_##rwlock(void) \ { \ ast_rwlock_destroy(&rwlock); \ } diff --git a/include/asterisk/logger.h b/include/asterisk/logger.h index 91be73181..06f3f5206 100644 --- a/include/asterisk/logger.h +++ b/include/asterisk/logger.h @@ -58,15 +58,14 @@ extern "C" { */ void ast_log(int level, const char *file, int line, const char *function, const char *fmt, ...) - __attribute__ ((format (printf, 5, 6))); + __attribute__((format(printf, 5, 6))); void ast_backtrace(void); /*! \brief Reload logger without rotating log files */ int logger_reload(void); -void ast_queue_log(const char *queuename, const char *callid, const char *agent, const char *event, const char *fmt, ...) - __attribute__ ((format (printf, 5, 6))); +void __attribute__((format(printf, 5, 6))) ast_queue_log(const char *queuename, const char *callid, const char *agent, const char *event, const char *fmt, ...); /*! Send a verbose message (based on verbose level) \brief This works like ast_log, but prints verbose messages to the console depending on verbosity level set. @@ -75,17 +74,15 @@ void ast_queue_log(const char *queuename, const char *callid, const char *agent, Note the abscence of a comma after the VERBOSE_PREFIX_3. This is important. VERBOSE_PREFIX_1 through VERBOSE_PREFIX_3 are defined. */ -void __ast_verbose(const char *file, int line, const char *func, const char *fmt, ...) - __attribute__ ((format (printf, 4, 5))); +void __attribute__((format(printf, 4, 5))) __ast_verbose(const char *file, int line, const char *func, const char *fmt, ...); #define ast_verbose(...) __ast_verbose(__FILE__, __LINE__, __PRETTY_FUNCTION__, __VA_ARGS__) -void __ast_verbose_ap(const char *file, int line, const char *func, const char *fmt, va_list ap); +void __attribute__((format(printf, 4, 0))) __ast_verbose_ap(const char *file, int line, const char *func, const char *fmt, va_list ap); #define ast_verbose_ap(fmt, ap) __ast_verbose_ap(__FILE__, __LINE__, __PRETTY_FUNCTION__, fmt, ap) -void ast_child_verbose(int level, const char *fmt, ...) - __attribute__ ((format (printf, 2, 3))); +void __attribute__((format(printf, 2, 3))) ast_child_verbose(int level, const char *fmt, ...); int ast_register_verbose(void (*verboser)(const char *string)) attribute_warn_unused_result; int ast_unregister_verbose(void (*verboser)(const char *string)) attribute_warn_unused_result; diff --git a/include/asterisk/manager.h b/include/asterisk/manager.h index 12e23e164..13d331f93 100644 --- a/include/asterisk/manager.h +++ b/include/asterisk/manager.h @@ -181,7 +181,7 @@ int astman_verify_session_writepermissions(uint32_t ident, int perm); #define manager_event(category, event, contents , ...) \ __manager_event(category, event, __FILE__, __LINE__, __PRETTY_FUNCTION__, contents , ## __VA_ARGS__) -int __attribute__ ((format(printf, 6, 7))) __manager_event(int category, const char *event, +int __attribute__((format(printf, 6, 7))) __manager_event(int category, const char *event, const char *file, int line, const char *func, const char *contents, ...); @@ -203,7 +203,7 @@ void astman_send_ack(struct mansession *s, const struct message *m, char *msg); /*! \brief Send ack in manager list transaction */ void astman_send_listack(struct mansession *s, const struct message *m, char *msg, char *listflag); -void __attribute__ ((format (printf, 2, 3))) astman_append(struct mansession *s, const char *fmt, ...); +void __attribute__((format(printf, 2, 3))) astman_append(struct mansession *s, const char *fmt, ...); /*! \brief Determinie if a manager session ident is authenticated */ int astman_is_authed(uint32_t ident); diff --git a/include/asterisk/module.h b/include/asterisk/module.h index 640c5af32..c952db448 100644 --- a/include/asterisk/module.h +++ b/include/asterisk/module.h @@ -250,11 +250,11 @@ void ast_module_unref(struct ast_module *); flags_to_set, \ AST_BUILDOPT_SUM, \ }; \ - static void __attribute__ ((constructor)) __reg_module(void) \ + static void __attribute__((constructor)) __reg_module(void) \ { \ ast_module_register(&__mod_info); \ } \ - static void __attribute__ ((destructor)) __unreg_module(void) \ + static void __attribute__((destructor)) __unreg_module(void) \ { \ ast_module_unregister(&__mod_info); \ } \ @@ -344,11 +344,11 @@ static void __restore_globals(void) .buildopt_sum = AST_BUILDOPT_SUM, \ fields \ }; \ - static void __attribute__ ((constructor)) __reg_module(void) \ + static void __attribute__((constructor)) __reg_module(void) \ { \ ast_module_register(&__mod_info); \ } \ - static void __attribute__ ((destructor)) __unreg_module(void) \ + static void __attribute__((destructor)) __unreg_module(void) \ { \ ast_module_unregister(&__mod_info); \ } \ diff --git a/include/asterisk/res_odbc.h b/include/asterisk/res_odbc.h index d90dbba9f..ad22045db 100644 --- a/include/asterisk/res_odbc.h +++ b/include/asterisk/res_odbc.h @@ -91,7 +91,7 @@ struct odbc_cache_tables { * This function really only ever worked with MySQL, where the statement handle is * not prepared on the server. If you are not using MySQL, you should avoid it. */ -int ast_odbc_smart_execute(struct odbc_obj *obj, SQLHSTMT stmt) __attribute__ ((deprecated)); +int ast_odbc_smart_execute(struct odbc_obj *obj, SQLHSTMT stmt) __attribute__((deprecated)); /*! * \brief Retrieves a connected ODBC object diff --git a/include/asterisk/stringfields.h b/include/asterisk/stringfields.h index b0cda6902..4b1847415 100644 --- a/include/asterisk/stringfields.h +++ b/include/asterisk/stringfields.h @@ -183,7 +183,7 @@ ast_string_field __ast_string_field_alloc_space(struct ast_string_field_mgr *mgr */ void __ast_string_field_ptr_build(struct ast_string_field_mgr *mgr, struct ast_string_field_pool **pool_head, - const ast_string_field *ptr, const char *format, ...); + const ast_string_field *ptr, const char *format, ...) __attribute((format(printf, 4, 5))); /*! \internal @@ -198,7 +198,7 @@ void __ast_string_field_ptr_build(struct ast_string_field_mgr *mgr, */ void __ast_string_field_ptr_build_va(struct ast_string_field_mgr *mgr, struct ast_string_field_pool **pool_head, - const ast_string_field *ptr, const char *format, va_list a1, va_list a2); + const ast_string_field *ptr, const char *format, va_list a1, va_list a2) __attribute((format(printf, 4, 0))); /*! \brief Declare a string field diff --git a/include/asterisk/strings.h b/include/asterisk/strings.h index 7c25ecd5e..43d5bfc41 100644 --- a/include/asterisk/strings.h +++ b/include/asterisk/strings.h @@ -217,7 +217,7 @@ void ast_copy_string(char *dst, const char *src, size_t size), \retval 0 on success \retval non-zero on failure. */ -int ast_build_string(char **buffer, size_t *space, const char *fmt, ...) __attribute__ ((format (printf, 3, 4))); +int ast_build_string(char **buffer, size_t *space, const char *fmt, ...) __attribute__((format(printf, 3, 4))); /*! \brief Build a string in a buffer, designed to be called repeatedly @@ -231,7 +231,7 @@ int ast_build_string(char **buffer, size_t *space, const char *fmt, ...) __attri \param fmt printf-style format string \param ap varargs list of arguments for format */ -int ast_build_string_va(char **buffer, size_t *space, const char *fmt, va_list ap) __attribute__((format (printf, 3, 0))); +int ast_build_string_va(char **buffer, size_t *space, const char *fmt, va_list ap) __attribute__((format(printf, 3, 0))); /*! * \brief Make sure something is true. @@ -597,8 +597,8 @@ enum { * through calling one of the other functions or macros defined in this * file. */ -int __ast_str_helper(struct ast_str **buf, size_t max_len, - int append, const char *fmt, va_list ap); +int __attribute__((format(printf, 4, 0))) __ast_str_helper(struct ast_str **buf, size_t max_len, + int append, const char *fmt, va_list ap); /*! * \brief Set a dynamic string from a va_list @@ -638,7 +638,7 @@ int __ast_str_helper(struct ast_str **buf, size_t max_len, * } * \endcode */ -AST_INLINE_API(int ast_str_set_va(struct ast_str **buf, size_t max_len, const char *fmt, va_list ap), +AST_INLINE_API(int __attribute__((format(printf, 3, 0))) ast_str_set_va(struct ast_str **buf, size_t max_len, const char *fmt, va_list ap), { return __ast_str_helper(buf, max_len, 0, fmt, ap); } @@ -649,7 +649,7 @@ AST_INLINE_API(int ast_str_set_va(struct ast_str **buf, size_t max_len, const ch * * Same as ast_str_set_va(), but append to the current content. */ -AST_INLINE_API(int ast_str_append_va(struct ast_str **buf, size_t max_len, const char *fmt, va_list ap), +AST_INLINE_API(int __attribute__((format(printf, 3, 0))) ast_str_append_va(struct ast_str **buf, size_t max_len, const char *fmt, va_list ap), { return __ast_str_helper(buf, max_len, 1, fmt, ap); } @@ -673,7 +673,7 @@ AST_INLINE_API(int ast_str_append_va(struct ast_str **buf, size_t max_len, const * All the rest is the same as ast_str_set_va() */ AST_INLINE_API( -int __attribute__ ((format (printf, 3, 4))) ast_str_set( +int __attribute__((format(printf, 3, 4))) ast_str_set( struct ast_str **buf, size_t max_len, const char *fmt, ...), { int res; @@ -694,7 +694,7 @@ int __attribute__ ((format (printf, 3, 4))) ast_str_set( * ast_str_set(), but the new data is appended to the current value. */ AST_INLINE_API( -int __attribute__ ((format (printf, 3, 4))) ast_str_append( +int __attribute__((format(printf, 3, 4))) ast_str_append( struct ast_str **buf, size_t max_len, const char *fmt, ...), { int res; diff --git a/include/asterisk/utils.h b/include/asterisk/utils.h index ed69de6ce..3737ef9c2 100644 --- a/include/asterisk/utils.h +++ b/include/asterisk/utils.h @@ -554,7 +554,7 @@ char * attribute_malloc _ast_strndup(const char *str, size_t len, const char *fi #define ast_asprintf(ret, fmt, ...) \ _ast_asprintf((ret), __FILE__, __LINE__, __PRETTY_FUNCTION__, fmt, __VA_ARGS__) -int __attribute__((format (printf, 5, 6))) +int __attribute__((format(printf, 5, 6))) _ast_asprintf(char **ret, const char *file, int lineno, const char *func, const char *fmt, ...); /*! @@ -569,7 +569,7 @@ int __attribute__((format (printf, 5, 6))) _ast_vasprintf((ret), __FILE__, __LINE__, __PRETTY_FUNCTION__, (fmt), (ap)) AST_INLINE_API( -__attribute__((format (printf, 5, 0))) +__attribute__((format(printf, 5, 0))) int _ast_vasprintf(char **ret, const char *file, int lineno, const char *func, const char *fmt, va_list ap), { int res; @@ -676,7 +676,7 @@ static void force_inline _ast_assert(int condition, const char *condition_str, */ struct ast_eid { unsigned char eid[6]; -} __attribute__ ((__packed__)); +} __attribute__((__packed__)); /*! * \brief Global EID |