[asterisk-commits] chan misdn: Fix a few issues causing compile errors (asterisk[master])

SVN commits to the Asterisk project asterisk-commits at lists.digium.com
Mon Feb 8 05:56:53 CST 2016


Joshua Colp has submitted this change and it was merged.

Change subject: chan_misdn: Fix a few issues causing compile errors
......................................................................


chan_misdn: Fix a few issues causing compile errors

Change-Id: I54b48c24d7ca88ed80496fdfd142d08772a7ab98
---
M channels/chan_misdn.c
M channels/misdn_config.c
2 files changed, 3 insertions(+), 3 deletions(-)

Approvals:
  Richard Mudgett: Looks good to me, but someone else must approve
  Anonymous Coward #1000019: Verified
  Joshua Colp: Looks good to me, approved



diff --git a/channels/chan_misdn.c b/channels/chan_misdn.c
index 4bfb199..67f009d 100644
--- a/channels/chan_misdn.c
+++ b/channels/chan_misdn.c
@@ -369,8 +369,8 @@
 	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 5915b6e..ef644f2 100644
--- a/channels/misdn_config.c
+++ b/channels/misdn_config.c
@@ -698,7 +698,7 @@
 	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);

-- 
To view, visit https://gerrit.asterisk.org/2209
To unsubscribe, visit https://gerrit.asterisk.org/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: I54b48c24d7ca88ed80496fdfd142d08772a7ab98
Gerrit-PatchSet: 2
Gerrit-Project: asterisk
Gerrit-Branch: master
Gerrit-Owner: George Joseph <george.joseph at fairview5.com>
Gerrit-Reviewer: Anonymous Coward #1000019
Gerrit-Reviewer: Joshua Colp <jcolp at digium.com>
Gerrit-Reviewer: Richard Mudgett <rmudgett at digium.com>



More information about the asterisk-commits mailing list