diff options
Diffstat (limited to 'include/asterisk/format_cap.h')
| -rw-r--r-- | include/asterisk/format_cap.h | 33 |
1 files changed, 11 insertions, 22 deletions
diff --git a/include/asterisk/format_cap.h b/include/asterisk/format_cap.h index 94e81f869..e422cc609 100644 --- a/include/asterisk/format_cap.h +++ b/include/asterisk/format_cap.h @@ -46,20 +46,14 @@ enum ast_format_cap_flags { * \retval ast_format_cap object on success. * \retval NULL on failure. */ -struct ast_format_cap *__ast_format_cap_alloc(enum ast_format_cap_flags flags); -struct ast_format_cap *__ast_format_cap_alloc_debug(enum ast_format_cap_flags flags, const char *tag, const char *file, int line, const char *func); +struct ast_format_cap *__ast_format_cap_alloc(enum ast_format_cap_flags flags, + const char *tag, const char *file, int line, const char *func); -#ifdef REF_DEBUG #define ast_format_cap_alloc(flags) \ - __ast_format_cap_alloc_debug((flags), "", __FILE__, __LINE__, __PRETTY_FUNCTION__) + __ast_format_cap_alloc((flags), "ast_format_cap_alloc", \ + __FILE__, __LINE__, __PRETTY_FUNCTION__) #define ast_t_format_cap_alloc(flags, tag) \ - __ast_format_cap_alloc_debug((flags), (tag), __FILE__, __LINE__, __PRETTY_FUNCTION__) -#else -#define ast_format_cap_alloc(flags) \ - __ast_format_cap_alloc((flags)) -#define ast_t_format_cap_alloc(flags, tag) \ - __ast_format_cap_alloc((flags)) -#endif + __ast_format_cap_alloc((flags), (tag), __FILE__, __LINE__, __PRETTY_FUNCTION__) /*! * \brief Set the global framing. @@ -103,20 +97,15 @@ unsigned int ast_format_cap_get_framing(const struct ast_format_cap *cap); * * \note If framing is specified here it overrides any global framing that has been set. */ -int __ast_format_cap_append(struct ast_format_cap *cap, struct ast_format *format, unsigned int framing); -int __ast_format_cap_append_debug(struct ast_format_cap *cap, struct ast_format *format, unsigned int framing, const char *tag, const char *file, int line, const char *func); +int __ast_format_cap_append(struct ast_format_cap *cap, struct ast_format *format, unsigned int framing, + const char *tag, const char *file, int line, const char *func); -#ifdef REF_DEBUG -#define ast_format_cap_append(cap, format, framing) \ - __ast_format_cap_append_debug((cap), (format), (framing), "", __FILE__, __LINE__, __PRETTY_FUNCTION__) -#define ast_t_format_cap_append(cap, format, framing, tag) \ - __ast_format_cap_append_debug((cap), (format), (framing), (tag), __FILE__, __LINE__, __PRETTY_FUNCTION__) -#else #define ast_format_cap_append(cap, format, framing) \ - __ast_format_cap_append((cap), (format), (framing)) + __ast_format_cap_append((cap), (format), (framing), "ast_format_cap_append", \ + __FILE__, __LINE__, __PRETTY_FUNCTION__) #define ast_t_format_cap_append(cap, format, framing, tag) \ - __ast_format_cap_append((cap), (format), (framing)) -#endif + __ast_format_cap_append((cap), (format), (framing), (tag), \ + __FILE__, __LINE__, __PRETTY_FUNCTION__) /*! * \brief Add all codecs Asterisk knows about for a specific type to |