diff options
| author | Russell Bryant <russell@russellbryant.com> | 2005-10-27 02:19:37 +0000 |
|---|---|---|
| committer | Russell Bryant <russell@russellbryant.com> | 2005-10-27 02:19:37 +0000 |
| commit | 9ddf0e4dcecf6ec6e2147ca6bfe58b7eeef8bced (patch) | |
| tree | 9f24232bc60be91cb9017aab391d2eff0f4a6341 /channels/chan_h323.c | |
| parent | 3332a8acd19e3ef6e0fb71ff38e5ab1187f9c1ea (diff) | |
Remove unnecessary checks before calls to ast_strlen_zero. Also, change
some places where strlen is used instead of ast_strlen_zero
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@6866 65c4cc65-6c06-0410-ace0-fbb531ad65f3
Diffstat (limited to 'channels/chan_h323.c')
| -rwxr-xr-x | channels/chan_h323.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/channels/chan_h323.c b/channels/chan_h323.c index e98638bb5..208e817be 100755 --- a/channels/chan_h323.c +++ b/channels/chan_h323.c @@ -767,12 +767,12 @@ static struct ast_channel *__oh323_new(struct oh323_pvt *pvt, int state, const c } if (!ast_strlen_zero(pvt->cid_num)) { ch->cid.cid_num = strdup(pvt->cid_num); - } else if (pvt->cd.call_source_e164 && !ast_strlen_zero(pvt->cd.call_source_e164)) { + } else if (!ast_strlen_zero(pvt->cd.call_source_e164)) { ch->cid.cid_num = strdup(pvt->cd.call_source_e164); } if (!ast_strlen_zero(pvt->cid_name)) { ch->cid.cid_name = strdup(pvt->cid_name); - } else if (pvt->cd.call_source_e164 && !ast_strlen_zero(pvt->cd.call_source_name)) { + } else if (!ast_strlen_zero(pvt->cd.call_source_name)) { ch->cid.cid_name = strdup(pvt->cd.call_source_name); } if (!ast_strlen_zero(pvt->rdnis)) { @@ -1037,7 +1037,7 @@ static struct ast_channel *oh323_request(const char *type, int format, void *dat ext = NULL; } strtok_r(host, "/", &(h323id)); - if (h323id && !ast_strlen_zero(h323id)) { + if (!ast_strlen_zero(h323id)) { h323_set_id(h323id); } if (ext) { |