diff options
| author | Joshua Colp <jcolp@digium.com> | 2016-02-08 05:56:43 -0600 |
|---|---|---|
| committer | Gerrit Code Review <gerrit2@gerrit.digium.api> | 2016-02-08 05:56:44 -0600 |
| commit | 78fa818c1bdcbb5c0bcd5c651e14c7f607ac4997 (patch) | |
| tree | 118ab8cb116e8e1cf5e89428b87946f992367603 | |
| parent | 6f978fbfe5f2a90244ea6a84bd7063adbe97ba85 (diff) | |
| parent | ec8fd6714d3f82f3ef3f3f53c0c93285dd7470fe (diff) | |
Merge "chan_misdn: Fix a few issues causing compile errors" into 13
| -rw-r--r-- | channels/chan_misdn.c | 4 | ||||
| -rw-r--r-- | 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 ae8bcd7b8..d1e55679e 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 32f92c323..a3ea315a1 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); |