summaryrefslogtreecommitdiff
path: root/channels
diff options
context:
space:
mode:
authorKevin P. Fleming <kpfleming@digium.com>2005-11-08 01:55:31 +0000
committerKevin P. Fleming <kpfleming@digium.com>2005-11-08 01:55:31 +0000
commita0a97696160c209413f213208b906d2990650320 (patch)
treece21ec4bfdeea79845fbbf2eb5308a2e6d513fc8 /channels
parent2ea48ce114efcce674220ef6cbb1cd61f3e79494 (diff)
issue #5648
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@7011 65c4cc65-6c06-0410-ace0-fbb531ad65f3
Diffstat (limited to 'channels')
-rwxr-xr-xchannels/chan_misdn.c4
-rwxr-xr-xchannels/chan_sip.c4
2 files changed, 4 insertions, 4 deletions
diff --git a/channels/chan_misdn.c b/channels/chan_misdn.c
index 6496dea71..09cd87513 100755
--- a/channels/chan_misdn.c
+++ b/channels/chan_misdn.c
@@ -3466,7 +3466,7 @@ static int misdn_facility_exec(struct ast_channel *chan, void *data)
return -1;
}
- if (!data || ast_strlen_zero((char *)data)) {
+ if (ast_strlen_zero((char *)data)) {
ast_log(LOG_WARNING, "misdn_facility Requires arguments\n");
return -1;
}
@@ -3509,7 +3509,7 @@ static int misdn_set_opt_exec(struct ast_channel *chan, void *data)
return -1;
}
- if (!data || ast_strlen_zero((char *)data)) {
+ if (ast_strlen_zero((char *)data)) {
ast_log(LOG_WARNING, "misdn_set_opt Requires arguments\n");
return -1;
}
diff --git a/channels/chan_sip.c b/channels/chan_sip.c
index 7985d0633..29fdfa23a 100755
--- a/channels/chan_sip.c
+++ b/channels/chan_sip.c
@@ -4845,14 +4845,14 @@ static int transmit_invite(struct sip_pvt *p, int sipmethod, int sdp, int init)
add_header(&req, "Referred-By", p->referred_by);
}
#ifdef OSP_SUPPORT
- if (p->options && p->options->osptoken && !ast_strlen_zero(p->options->osptoken)) {
+ if (p->options && !ast_strlen_zero(p->options->osptoken)) {
ast_log(LOG_DEBUG,"Adding OSP Token: %s\n", p->options->osptoken);
add_header(&req, "P-OSP-Auth-Token", p->options->osptoken);
} else {
ast_log(LOG_DEBUG,"NOT Adding OSP Token\n");
}
#endif
- if (p->options && p->options->distinctive_ring && !ast_strlen_zero(p->options->distinctive_ring))
+ if (p->options && !ast_strlen_zero(p->options->distinctive_ring))
{
add_header(&req, "Alert-Info", p->options->distinctive_ring);
}