diff options
| author | Corey Farrell <git@cfware.com> | 2015-04-17 03:16:59 -0400 |
|---|---|---|
| committer | Corey Farrell <git@cfware.com> | 2015-04-27 18:37:26 -0400 |
| commit | 5c1d07baf083fd791c8f717209551d9227413ef7 (patch) | |
| tree | 7eff8c651efb82e89fd7918038102b84fe888ced /include/asterisk/format_cap.h | |
| parent | d7f4788341f08f386341416aa3944c7f9bc0dc1b (diff) | |
Astobj2: Allow reference debugging to be enabled/disabled by config.
* The REF_DEBUG compiler flag no longer has any effect on code that uses
Astobj2. It is used to determine if reference debugging is enabled by
default. Reference debugging can be enabled or disabled in asterisk.conf.
* Caller information is provided in logger errors for ao2 bad magic numbers.
* Optimizes AO2 by merging internal functions with the public counterpart.
This was possible now that we no longer require a dual ABI.
ASTERISK-24974 #close
Reported by: Corey Farrell
Change-Id: Icf3552721fe999365ba8a8cf00a965aa6b897cc1
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 |