diff options
author | russell <russell@f38db490-d61c-443f-a65b-d21fe96a405b> | 2005-10-27 02:19:37 +0000 |
---|---|---|
committer | russell <russell@f38db490-d61c-443f-a65b-d21fe96a405b> | 2005-10-27 02:19:37 +0000 |
commit | ee234bbb3efea571ea7ad138de22f1e010b92ec9 (patch) | |
tree | 9f24232bc60be91cb9017aab391d2eff0f4a6341 /channels/chan_iax2.c | |
parent | 4cc87ee6e1e0ad07889f178b9c843fdd55d826e8 (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: http://svn.digium.com/svn/asterisk/trunk@6866 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'channels/chan_iax2.c')
-rwxr-xr-x | channels/chan_iax2.c | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/channels/chan_iax2.c b/channels/chan_iax2.c index c901f917b..354d10742 100755 --- a/channels/chan_iax2.c +++ b/channels/chan_iax2.c @@ -1287,7 +1287,7 @@ static int iax_check_version(char *dev) { int res = 0; struct iax_firmware *cur; - if (dev && !ast_strlen_zero(dev)) { + if (!ast_strlen_zero(dev)) { ast_mutex_lock(&waresl.lock); cur = waresl.wares; while(cur) { @@ -1309,7 +1309,7 @@ static int iax_firmware_append(struct iax_ie_data *ied, const unsigned char *dev unsigned int start = (desc >> 8) & 0xffffff; unsigned int bytes; struct iax_firmware *cur; - if (dev && !ast_strlen_zero((char *)dev) && bs) { + if (!ast_strlen_zero((char *)dev) && bs) { start *= bs; ast_mutex_lock(&waresl.lock); cur = waresl.wares; @@ -2836,7 +2836,7 @@ struct parsed_dial_string { */ static void parse_dial_string(char *data, struct parsed_dial_string *pds) { - if (!data || ast_strlen_zero(data)) + if (ast_strlen_zero(data)) return; pds->peer = strsep(&data, "/"); @@ -2953,9 +2953,9 @@ static int iax2_call(struct ast_channel *c, char *dest, int timeout) if (ast_test_flag(iaxs[callno], IAX_SENDANI) && c->cid.cid_ani) iax_ie_append_str(&ied, IAX_IE_CALLING_ANI, c->cid.cid_ani); - if (c->language && !ast_strlen_zero(c->language)) + if (!ast_strlen_zero(c->language)) iax_ie_append_str(&ied, IAX_IE_LANGUAGE, c->language); - if (c->cid.cid_dnid && !ast_strlen_zero(c->cid.cid_dnid)) + if (!ast_strlen_zero(c->cid.cid_dnid)) iax_ie_append_str(&ied, IAX_IE_DNID, c->cid.cid_dnid); if (pds.context) @@ -4288,7 +4288,7 @@ static int manager_iax2_show_peers( struct mansession *s, struct message *m ) int ret; char *id; id = astman_get_header(m,"ActionID"); - if (id && !ast_strlen_zero(id)) + if (!ast_strlen_zero(id)) ast_cli(s->fd, "ActionID: %s\r\n",id); ret = __iax2_show_peers(1, s->fd, 3, a ); ast_cli(s->fd, "\r\n\r\n" ); @@ -5123,9 +5123,9 @@ static int authenticate(char *challenge, char *secret, char *keyn, int authmetho int res = -1; int x; char iabuf[INET_ADDRSTRLEN]; - if (keyn && !ast_strlen_zero(keyn)) { + if (!ast_strlen_zero(keyn)) { if (!(authmethods & IAX_AUTH_RSA)) { - if (!secret || ast_strlen_zero(secret)) + if (ast_strlen_zero(secret)) ast_log(LOG_NOTICE, "Asked to authenticate to %s with an RSA key, but they don't allow RSA authentication\n", ast_inet_ntoa(iabuf, sizeof(iabuf), sin->sin_addr)); } else if (ast_strlen_zero(challenge)) { ast_log(LOG_NOTICE, "No challenge provided for RSA authentication to %s\n", ast_inet_ntoa(iabuf, sizeof(iabuf), sin->sin_addr)); @@ -5147,7 +5147,7 @@ static int authenticate(char *challenge, char *secret, char *keyn, int authmetho } } /* Fall back */ - if (res && secret && !ast_strlen_zero(secret)) { + if (res && !ast_strlen_zero(secret)) { if ((authmethods & IAX_AUTH_MD5) && !ast_strlen_zero(challenge)) { struct MD5Context md5; unsigned char digest[16]; @@ -5194,7 +5194,7 @@ static int authenticate_reply(struct chan_iax2_pvt *p, struct sockaddr_in *sin, p->encmethods = 0; /* Check for override RSA authentication first */ - if ((override && !ast_strlen_zero(override)) || (okey && !ast_strlen_zero(okey))) { + if (!ast_strlen_zero(override) || !ast_strlen_zero(okey)) { /* Normal password authentication */ res = authenticate(p->challenge, override, okey, authmethods, &ied, sin, &p->ecx, &p->dcx); } else { @@ -7681,7 +7681,7 @@ static int iax2_prov_app(struct ast_channel *chan, void *data) int force =0; unsigned short callno = PTR_TO_CALLNO(chan->tech_pvt); char iabuf[INET_ADDRSTRLEN]; - if (!data || ast_strlen_zero(data)) + if (ast_strlen_zero(data)) data = "default"; sdata = ast_strdupa(data); opts = strchr(sdata, '|'); |