From ee234bbb3efea571ea7ad138de22f1e010b92ec9 Mon Sep 17 00:00:00 2001 From: russell Date: Thu, 27 Oct 2005 02:19:37 +0000 Subject: 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: http://svn.digium.com/svn/asterisk/trunk@6866 f38db490-d61c-443f-a65b-d21fe96a405b --- channels/chan_h323.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'channels/chan_h323.c') 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) { -- cgit v1.2.3