From ec8fd6714d3f82f3ef3f3f53c0c93285dd7470fe Mon Sep 17 00:00:00 2001 From: George Joseph Date: Fri, 5 Feb 2016 09:29:00 -0700 Subject: [PATCH] chan_misdn: Fix a few issues causing compile errors Change-Id: I54b48c24d7ca88ed80496fdfd142d08772a7ab98 --- channels/chan_misdn.c | 4 ++-- channels/misdn_config.c | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/channels/chan_misdn.c b/channels/chan_misdn.c index ae8bcd7b8a..d1e55679e0 100644 --- a/channels/chan_misdn.c +++ b/channels/chan_misdn.c @@ -369,8 +369,8 @@ struct hold_info { int channel; }; -#define chan_list_ref(obj, debug) (ao2_t_ref((obj), +1, (debug)), (obj)) -#define chan_list_unref(obj, debug) (ao2_t_ref((obj), -1, (debug)), NULL) +#define chan_list_ref(obj, debug) ao2_t_ref((obj), +1, (debug)) +#define chan_list_unref(obj, debug) ao2_t_ref((obj), -1, (debug)) /*! * \brief Channel call record structure diff --git a/channels/misdn_config.c b/channels/misdn_config.c index 32f92c3238..a3ea315a1a 100644 --- a/channels/misdn_config.c +++ b/channels/misdn_config.c @@ -698,7 +698,7 @@ void misdn_cfg_get_desc (enum misdn_cfg_elements elem, void *buf, int bufsize, v else if ((elem > MISDN_GEN_FIRST) && (elem < MISDN_GEN_LAST)) spec = (struct misdn_cfg_spec *)gen_spec; - if (!spec || !spec[place].desc) + if (!spec) memset(buf, 0, 1); else { ast_copy_string(buf, spec[place].desc, bufsize);