summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJoshua Colp <jcolp@digium.com>2016-02-08 05:56:52 -0600
committerGerrit Code Review <gerrit2@gerrit.digium.api>2016-02-08 05:56:52 -0600
commit7e4378770d6c459702e07ecf01c9fc6e1400c207 (patch)
tree791010edf03776f5c5daea444b790061ed6d49e5
parent1bc54aee8037b6338bd53625e6c8d7699b40a9f7 (diff)
parentb69729dde54792cc43d2ce0f281075867f3fbdf8 (diff)
Merge "chan_misdn: Fix a few issues causing compile errors"
-rw-r--r--channels/chan_misdn.c4
-rw-r--r--channels/misdn_config.c2
2 files changed, 3 insertions, 3 deletions
diff --git a/channels/chan_misdn.c b/channels/chan_misdn.c
index 4bfb1993d..67f009d50 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 5915b6e9e..ef644f2cb 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);