Asterisk
/
asterisk
mirror of https://github.com/asterisk/asterisk
1
0
Fork 0
Code Issues Releases Wiki Activity

remove unnecessary checks before calls to ast_strlen_zero

Browse Source 
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@6864 65c4cc65-6c06-0410-ace0-fbb531ad65f3
1.2-netsec
Russell Bryant 20 years ago
parent dbc5c06c94
commit 5187de9ab6
59 changed files with 108 additions and 109 deletions
Show Stats Download Patch File Download Diff File

2
apps/app_adsiprog.c
Unescape View File

@ -1555,7 +1555,7 @@ static int adsi_exec(struct ast_channel *chan, void *data)
LOCAL_USER_ADD(u);
if (!data || ast_strlen_zero(data))
if (ast_strlen_zero(data))
data = "asterisk.adsi";
if (!adsi_available(chan)) {

8
apps/app_alarmreceiver.c
Unescape View File

@ -117,7 +117,7 @@ static void database_increment( char *key )
char value[16];
if(!strlen(db_family))
if (ast_strlen_zero(db_family))
return; /* If not defined, don't do anything */
res = ast_db_get(db_family, key, value, sizeof(value) - 1);
@ -392,7 +392,7 @@ static int log_events(struct ast_channel *chan, char *signalling_type, event_no
FILE *logfile;
event_node_t *elp = event;
if(strlen(event_spool_dir)){
if (!ast_strlen_zero(event_spool_dir)) {
/* Make a template */
@ -516,7 +516,7 @@ static int receive_ademco_contact_id( struct ast_channel *chan, void *data, int
ast_verbose(VERBOSE_PREFIX_2 "AlarmReceiver: Incomplete string: %s, trying again...\n", event);
if(!got_some_digits){
got_some_digits = (strlen(event)) ? 1 : 0;
got_some_digits = (!ast_strlen_zero(event)) ? 1 : 0;
ack_retries++;
}
continue;
@ -715,7 +715,7 @@ static int alarmreceiver_exec(struct ast_channel *chan, void *data)
* Do we exec a command line at the end?
*/
if((!res) && (strlen(event_app)) && (event_head)){
if((!res) && (!ast_strlen_zero(event_app)) && (event_head)){
ast_log(LOG_DEBUG,"Alarmreceiver: executing: %s\n", event_app);
ast_safe_system(event_app);
}

2
apps/app_authenticate.c
Unescape View File

@ -85,7 +85,7 @@ static int auth_exec(struct ast_channel *chan, void *data)
char *opts;
char *prompt;
if (!data || ast_strlen_zero(data)) {
if (ast_strlen_zero(data)) {
ast_log(LOG_WARNING, "Authenticate requires an argument(password)\n");
return -1;
}

2
apps/app_chanisavail.c
Unescape View File

@ -74,7 +74,7 @@ static int chanavail_exec(struct ast_channel *chan, void *data)
char *info, tmp[512], trychan[512], *peers, *tech, *number, *rest, *cur, *options, *stringp;
struct ast_channel *tempchan;
if (!data || ast_strlen_zero(data)) {
if (ast_strlen_zero(data)) {
ast_log(LOG_WARNING, "ChanIsAvail requires an argument (Zap/1&Zap/2)\n");
return -1;
}

2
apps/app_controlplayback.c
Unescape View File

@ -81,7 +81,7 @@ static int controlplayback_exec(struct ast_channel *chan, void *data)
arg_restart = 6,
};
if (!data || ast_strlen_zero(data)) {
if (ast_strlen_zero(data)) {
ast_log(LOG_WARNING, "ControlPlayback requires an argument (filename)\n");
return -1;
}

6
apps/app_curl.c
Unescape View File

@ -123,14 +123,14 @@ static int curl_exec(struct ast_channel *chan, void *data)
dep_warning = 1;
}
if (!data || ast_strlen_zero(data)) {
if (ast_strlen_zero(data)) {
ast_log(LOG_WARNING, "Curl requires an argument (URL)\n");
return -1;
}
LOCAL_USER_ADD(u);
if ((info = ast_strdupa((char *)data))) {
if ((info = ast_strdupa(data))) {
url = strsep(&info, "|");
post_data = info;
} else {
@ -166,7 +166,7 @@ static char *acf_curl_exec(struct ast_channel *chan, char *cmd, char *data, char
*buf = '\0';
if (!data || ast_strlen_zero(data)) {
if (ast_strlen_zero(data)) {
ast_log(LOG_WARNING, "CURL requires an argument (URL)\n");
return buf;
}

2
apps/app_db.c
Unescape View File

@ -97,7 +97,7 @@ static int deltree_exec(struct ast_channel *chan, void *data)
LOCAL_USER_REMOVE(u);
return 0;
}
if (!strlen(keytree))
if (ast_strlen_zero(keytree))
keytree = 0;
} else {
family = argv;

23
apps/app_dial.c
Unescape View File

@ -399,7 +399,7 @@ static struct ast_channel *wait_for_answer(struct ast_channel *in, struct localu
if (ast_test_flag(o, DIAL_FORCECALLERID)) {
char *newcid = NULL;
if (strlen(in->macroexten))
if (!ast_strlen_zero(in->macroexten))
newcid = in->macroexten;
else
newcid = in->exten;
@ -691,7 +691,7 @@ static int dial_exec_full(struct ast_channel *chan, void *data, struct ast_flags
char *dblgoto = NULL;
int priority_jump = 0;
if (!data || ast_strlen_zero(data)) {
if (ast_strlen_zero(data)) {
ast_log(LOG_WARNING, "Dial requires an argument (technology1/number1&technology2/number2...|optional timeout|options)\n");
return -1;
}
@ -731,7 +731,7 @@ static int dial_exec_full(struct ast_channel *chan, void *data, struct ast_flags
}
} else
timeout = NULL;
if (!peers || ast_strlen_zero(peers)) {
if (ast_strlen_zero(peers)) {
ast_log(LOG_WARNING, "Dial argument takes format (technology1/number1&technology2/number2...|optional timeout)\n");
goto out;
}
@ -965,7 +965,7 @@ static int dial_exec_full(struct ast_channel *chan, void *data, struct ast_flags
char callerid[60];
l = chan->cid.cid_num;
if (l && !ast_strlen_zero(l)) {
if (!ast_strlen_zero(l)) {
ast_shrink_phone_number(l);
if( privacy ) {
if (option_verbose > 2)
@ -1235,7 +1235,7 @@ static int dial_exec_full(struct ast_channel *chan, void *data, struct ast_flags
cur = rest;
} while (cur);
if (timeout && !ast_strlen_zero(timeout)) {
if (!ast_strlen_zero(timeout)) {
to = atoi(timeout);
if (to > 0)
to *= 1000;
@ -1294,12 +1294,11 @@ static int dial_exec_full(struct ast_channel *chan, void *data, struct ast_flags
if (!number)
number = numsubst;
pbx_builtin_setvar_helper(chan, "DIALEDPEERNUMBER", number);
/* JDG: sendurl */
if ( url && !ast_strlen_zero(url) && ast_channel_supports_html(peer) ) {
if (!ast_strlen_zero(url) && ast_channel_supports_html(peer) ) {
ast_log(LOG_DEBUG, "app_dial: sendurl=%s.\n", url);
ast_channel_sendurl( peer, url );
} /* /JDG */
if( privacy || screen ) {
}
if (privacy || screen) {
int res2;
int loopcount = 0;
if( privdb_val == AST_PRIVACY_UNKNOWN ) {
@ -1594,12 +1593,12 @@ static int dial_exec_full(struct ast_channel *chan, void *data, struct ast_flags
time(&now);
chan->whentohangup = now + calldurationlimit;
}
if (dtmfcalled && !ast_strlen_zero(dtmfcalled)) {
if (!ast_strlen_zero(dtmfcalled)) {
if (option_verbose > 2)
ast_verbose(VERBOSE_PREFIX_3 "Sending DTMF '%s' to the called party.\n",dtmfcalled);
res = ast_dtmf_stream(peer,chan,dtmfcalled,250);
}
if (dtmfcalling && !ast_strlen_zero(dtmfcalling)) {
if (!ast_strlen_zero(dtmfcalling)) {
if (option_verbose > 2)
ast_verbose(VERBOSE_PREFIX_3 "Sending DTMF '%s' to the calling party.\n",dtmfcalling);
res = ast_dtmf_stream(chan,peer,dtmfcalling,250);
@ -1698,7 +1697,7 @@ static int retrydial_exec(struct ast_channel *chan, void *data)
struct localuser *u;
struct ast_flags peerflags;
if (!data || ast_strlen_zero(data)) {
if (ast_strlen_zero(data)) {
ast_log(LOG_WARNING, "RetryDial requires an argument!\n");
return -1;
}

2
apps/app_dictate.c
Unescape View File

@ -101,7 +101,7 @@ static int dictate_exec(struct ast_channel *chan, void *data)
LOCAL_USER_ADD(u);
snprintf(dftbase, sizeof(dftbase), "%s/dictate", ast_config_AST_SPOOL_DIR);
if (data && !ast_strlen_zero(data) && (mydata = ast_strdupa(data))) {
if (!ast_strlen_zero(data) && (mydata = ast_strdupa(data))) {
argc = ast_separate_app_args(mydata, '|', argv, sizeof(argv) / sizeof(argv[0]));
}

2
apps/app_directed_pickup.c
Unescape View File

@ -57,7 +57,7 @@ static int pickup_exec(struct ast_channel *chan, void *data)
char *tmp = NULL, *exten = NULL, *context = NULL;
char workspace[256] = "";
if (!data || ast_strlen_zero(data)) {
if (ast_strlen_zero(data)) {
ast_log(LOG_WARNING, "Pickup requires an argument (extension) !\n");
return -1;
}

8
apps/app_directory.c
Unescape View File

@ -293,7 +293,7 @@ static int do_directory(struct ast_channel *chan, struct ast_config *cfg, char *
int lastuserchoice = 0;
char *start, *pos, *conv,*stringp=NULL;
if (!context || ast_strlen_zero(context)) {
if (ast_strlen_zero(context)) {
ast_log(LOG_WARNING,
"Directory must be called with an argument "
"(context in which to interpret extensions)\n");
@ -410,7 +410,7 @@ static int directory_exec(struct ast_channel *chan, void *data)
int last = 1;
char *context, *dialcontext, *dirintro, *options;
if (!data || ast_strlen_zero(data)) {
if (ast_strlen_zero(data)) {
ast_log(LOG_WARNING, "Directory requires an argument (context[,dialcontext])\n");
return -1;
}
@ -439,9 +439,9 @@ static int directory_exec(struct ast_channel *chan, void *data)
}
dirintro = ast_variable_retrieve(cfg, context, "directoryintro");
if (!dirintro || ast_strlen_zero(dirintro))
if (ast_strlen_zero(dirintro))
dirintro = ast_variable_retrieve(cfg, "general", "directoryintro");
if (!dirintro || ast_strlen_zero(dirintro)) {
if (ast_strlen_zero(dirintro)) {
if (last)
dirintro = "dir-intro";
else

2
apps/app_disa.c
Unescape View File

@ -126,7 +126,7 @@ static int disa_exec(struct ast_channel *chan, void *data)
FILE *fp;
char *stringp=NULL;
if (!data || ast_strlen_zero(data)) {
if (ast_strlen_zero(data)) {
ast_log(LOG_WARNING, "disa requires an argument (passcode/passcode file)\n");
return -1;
}

2
apps/app_dumpchan.c
Unescape View File

@ -141,7 +141,7 @@ static int dumpchan_exec(struct ast_channel *chan, void *data)
LOCAL_USER_ADD(u);
if (data && !ast_strlen_zero(data)) {
if (!ast_strlen_zero(data)) {
level = atoi(data);
}

2
apps/app_enumlookup.c
Unescape View File

@ -85,7 +85,7 @@ static int enumlookup_exec(struct ast_channel *chan, void *data)
static int dep_warning=0;
struct localuser *u;
if (!data || ast_strlen_zero(data)) {
if (ast_strlen_zero(data)) {
ast_log(LOG_WARNING, "EnumLookup requires an argument (extension)\n");
return -1;
}

2
apps/app_externalivr.c
Unescape View File

@ -262,7 +262,7 @@ static int app_exec(struct ast_channel *chan, void *data)
AST_LIST_HEAD_INIT(&u->finishlist);
u->abort_current_sound = 0;
if (!args || ast_strlen_zero(args)) {
if (ast_strlen_zero(args)) {
ast_log(LOG_WARNING, "ExternalIVR requires a command to execute\n");
goto exit;
}

2
apps/app_festival.c
Unescape View File

@ -296,7 +296,7 @@ static int festival_exec(struct ast_channel *chan, void *vdata)
char *intstr;
struct ast_config *cfg;
if (!vdata || ast_strlen_zero(vdata)) {
if (ast_strlen_zero(vdata)) {
ast_log(LOG_WARNING, "festival requires an argument (text)\n");
return -1;
}

2
apps/app_forkcdr.c
Unescape View File

@ -74,7 +74,7 @@ static int forkcdr_exec(struct ast_channel *chan, void *data)
int res=0;
struct localuser *u;
LOCAL_USER_ADD(u);
if (data && !ast_strlen_zero(data))
if (!ast_strlen_zero(data))
ast_set2_flag(chan->cdr, strchr((char *)data, 'v'), AST_CDR_FLAG_KEEP_VARS);
ast_cdr_fork(chan);

2
apps/app_groupcount.c
Unescape View File

@ -145,7 +145,7 @@ static int group_check_exec(struct ast_channel *chan, void *data)
deprecation_warning = 1;
}
if (!data || ast_strlen_zero(data)) {
if (ast_strlen_zero(data)) {
ast_log(LOG_WARNING, "CheckGroup requires an argument(max[@category])\n");
return res;
}

4
apps/app_hasnewvoicemail.c
Unescape View File

@ -115,13 +115,13 @@ static int hasvoicemail_exec(struct ast_channel *chan, void *data)
temps = input;
if ((temps = strsep(&input, "|"))) {
if (input && !ast_strlen_zero(input))
if (!ast_strlen_zero(input))
varname = input;
input = temps;
}
if ((vmbox = strsep(&input, "@")))
if (input && !ast_strlen_zero(input))
if (!ast_strlen_zero(input))
context = input;
if (!vmbox)
vmbox = input;

2
apps/app_ices.c
Unescape View File

@ -101,7 +101,7 @@ static int ices_exec(struct ast_channel *chan, void *data)
char filename[256]="";
char *c;
if (!data || ast_strlen_zero(data)) {
if (ast_strlen_zero(data)) {
ast_log(LOG_WARNING, "ICES requires an argument (configfile.xml)\n");
return -1;
}

2
apps/app_image.c
Unescape View File

@ -61,7 +61,7 @@ static int sendimage_exec(struct ast_channel *chan, void *data)
int res = 0;
struct localuser *u;
if (!data || ast_strlen_zero(data)) {
if (ast_strlen_zero(data)) {
ast_log(LOG_WARNING, "SendImage requires an argument (filename)\n");
return -1;
}

2
apps/app_ivrdemo.c
Unescape View File

@ -89,7 +89,7 @@ static int skel_exec(struct ast_channel *chan, void *data)
int res=0;
struct localuser *u;
if (!data || ast_strlen_zero(data)) {
if (ast_strlen_zero(data)) {
ast_log(LOG_WARNING, "skel requires an argument (filename)\n");
return -1;
}

4
apps/app_macro.c
Unescape View File

@ -111,7 +111,7 @@ static int macro_exec(struct ast_channel *chan, void *data)
char *save_macro_offset;
struct localuser *u;
if (!data || ast_strlen_zero(data)) {
if (ast_strlen_zero(data)) {
ast_log(LOG_WARNING, "Macro() requires arguments. See \"show application macro\" for help.\n");
return -1;
}
@ -137,7 +137,7 @@ static int macro_exec(struct ast_channel *chan, void *data)
tmp = ast_strdupa(data);
rest = tmp;
macro = strsep(&rest, "|");
if (!macro || ast_strlen_zero(macro)) {
if (ast_strlen_zero(macro)) {
ast_log(LOG_WARNING, "Invalid macro name specified\n");
LOCAL_USER_REMOVE(u);
return 0;

2
apps/app_math.c
Unescape View File

@ -108,7 +108,7 @@ static int math_exec(struct ast_channel *chan, void *data)
deprecation_warning = 1;
}
if (!data || ast_strlen_zero(data)) {
if (ast_strlen_zero(data)) {
ast_log(LOG_WARNING, "No parameters passed. !\n");
return -1;
}

4
apps/app_md5.c
Unescape View File

@ -73,7 +73,7 @@ static int md5_exec(struct ast_channel *chan, void *data)
dep_warning = 1;
}
if (!data || ast_strlen_zero(data)) {
if (ast_strlen_zero(data)) {
ast_log(LOG_WARNING, "Syntax: md5(<varname>=<string>) - missing argument!\n");
return -1;
}
@ -110,7 +110,7 @@ static int md5check_exec(struct ast_channel *chan, void *data)
dep_warning = 1;
}
if (!data || ast_strlen_zero(data)) {
if (ast_strlen_zero(data)) {
ast_log(LOG_WARNING, "Syntax: MD5Check(<md5hash>,<string>) - missing argument!\n");
return -1;
}

8
apps/app_meetme.c
Unescape View File

@ -1663,7 +1663,7 @@ static int count_exec(struct ast_channel *chan, void *data)
char *confnum, *localdata;
char val[80] = "0";
if (!data || ast_strlen_zero(data)) {
if (ast_strlen_zero(data)) {
ast_log(LOG_WARNING, "MeetMeCount requires an argument (conference number)\n");
return -1;
}
@ -1684,7 +1684,7 @@ static int count_exec(struct ast_channel *chan, void *data)
else
count = 0;
if (localdata && !ast_strlen_zero(localdata)){
if (!ast_strlen_zero(localdata)){
/* have var so load it and exit */
snprintf(val,sizeof(val), "%d",count);
pbx_builtin_setvar_helper(chan, localdata,val);
@ -1714,7 +1714,7 @@ static int conf_exec(struct ast_channel *chan, void *data)
LOCAL_USER_ADD(u);
if (!data || ast_strlen_zero(data)) {
if (ast_strlen_zero(data)) {
allowretry = 1;
notdata = "";
} else {
@ -1972,7 +1972,7 @@ static int admin_exec(struct ast_channel *chan, void *data) {
ast_mutex_lock(&conflock);
/* The param has the conference number the user and the command to execute */
if (data && !ast_strlen_zero(data)) {
if (!ast_strlen_zero(data)) {
params = ast_strdupa((char *) data);
conf = strsep(&params, "|");
command = strsep(&params, "|");

4
apps/app_mixmonitor.c
Unescape View File

@ -385,7 +385,7 @@ static int muxmon_exec(struct ast_channel *chan, void *data)
*filename = NULL,
*post_process = NULL;
if (!data || ast_strlen_zero(data)) {
if (ast_strlen_zero(data)) {
ast_log(LOG_WARNING, "muxmon requires an argument\n");
return -1;
}
@ -409,7 +409,7 @@ static int muxmon_exec(struct ast_channel *chan, void *data)
}
}
if (!filename || ast_strlen_zero(filename)) {
if (ast_strlen_zero(filename)) {
ast_log(LOG_WARNING, "Muxmon requires an argument (filename)\n");
LOCAL_USER_REMOVE(u);
return -1;

2
apps/app_mp3.c
Unescape View File

@ -128,7 +128,7 @@ static int mp3_exec(struct ast_channel *chan, void *data)
short frdata[160];
} myf;
if (!data || ast_strlen_zero(data)) {
if (ast_strlen_zero(data)) {
ast_log(LOG_WARNING, "MP3 Playback requires an argument (filename)\n");
return -1;
}

4
apps/app_muxmon.c
Unescape View File

@ -385,7 +385,7 @@ static int muxmon_exec(struct ast_channel *chan, void *data)
*filename = NULL,
*post_process = NULL;
if (!data || ast_strlen_zero(data)) {
if (ast_strlen_zero(data)) {
ast_log(LOG_WARNING, "muxmon requires an argument\n");
return -1;
}
@ -409,7 +409,7 @@ static int muxmon_exec(struct ast_channel *chan, void *data)
}
}
if (!filename || ast_strlen_zero(filename)) {
if (ast_strlen_zero(filename)) {
ast_log(LOG_WARNING, "Muxmon requires an argument (filename)\n");
LOCAL_USER_REMOVE(u);
return -1;

10
apps/app_osplookup.c
Unescape View File

@ -110,7 +110,7 @@ static int osplookup_exec(struct ast_channel *chan, void *data)
char *provider, *opts=NULL;
struct ast_osp_result result;
if (!data || ast_strlen_zero(data)) {
if (ast_strlen_zero(data)) {
ast_log(LOG_WARNING, "OSPLookup requires an argument (extension)\n");
return -1;
}
@ -169,7 +169,7 @@ static int ospnext_exec(struct ast_channel *chan, void *data)
int cause;
struct ast_osp_result result;
if (!data || ast_strlen_zero(data)) {
if (ast_strlen_zero(data)) {
ast_log(LOG_WARNING, "OSPNext should have an argument (cause)\n");
return -1;
}
@ -179,7 +179,7 @@ static int ospnext_exec(struct ast_channel *chan, void *data)
cause = str2cause((char *)data);
temp = pbx_builtin_getvar_helper(chan, "OSPHANDLE");
result.handle = -1;
if (temp && strlen(temp) && (sscanf(temp, "%d", &result.handle) == 1) && (result.handle > -1)) {
if (!ast_strlen_zero(temp) && (sscanf(temp, "%d", &result.handle) == 1) && (result.handle > -1)) {
if ((res = ast_osp_next(&result, cause)) > 0) {
char tmp[80];
snprintf(tmp, sizeof(tmp), "%d", result.handle);
@ -217,7 +217,7 @@ static int ospfinished_exec(struct ast_channel *chan, void *data)
time_t start=0, duration=0;
struct ast_osp_result result;
if (!data || ast_strlen_zero(data)) {
if (ast_strlen_zero(data)) {
ast_log(LOG_WARNING, "OSPFinish should have an argument (cause)\n");
return -1;
}
@ -236,7 +236,7 @@ static int ospfinished_exec(struct ast_channel *chan, void *data)
cause = str2cause((char *)data);
temp = pbx_builtin_getvar_helper(chan, "OSPHANDLE");
result.handle = -1;
if (temp && strlen(temp) && (sscanf(temp, "%d", &result.handle) == 1) && (result.handle > -1)) {
if (!ast_strlen_zero(temp) && (sscanf(temp, "%d", &result.handle) == 1) && (result.handle > -1)) {
if (!ast_osp_terminate(result.handle, cause, start, duration)) {
pbx_builtin_setvar_helper(chan, "_OSPHANDLE", "");
res = 1;

2
apps/app_page.c
Unescape View File

@ -120,7 +120,7 @@ static int page_exec(struct ast_channel *chan, void *data)
char *tmp;
int res=0;
if (!data || ast_strlen_zero(data)) {
if (ast_strlen_zero(data)) {
ast_log(LOG_WARNING, "This application requires at least one argument (destination(s) to page)\n");
return -1;
}

2
apps/app_parkandannounce.c
Unescape View File

@ -81,7 +81,7 @@ static int parkandannounce_exec(struct ast_channel *chan, void *data)
struct localuser *u;
if (!data || ast_strlen_zero(data)) {
if (ast_strlen_zero(data)) {
ast_log(LOG_WARNING, "ParkAndAnnounce requires arguments: (announce:template|timeout|dial|[return_context])\n");
return -1;
}

2
apps/app_playback.c
Unescape View File

@ -70,7 +70,7 @@ static int playback_exec(struct ast_channel *chan, void *data)
char *stringp = NULL;
char *front = NULL, *back = NULL;
if (!data || ast_strlen_zero(data)) {
if (ast_strlen_zero(data)) {
ast_log(LOG_WARNING, "Playback requires an argument (filename)\n");
return -1;
}

2
apps/app_privacy.c
Unescape View File

@ -85,7 +85,7 @@ privacy_exec (struct ast_channel *chan, void *data)
struct ast_config *cfg;
LOCAL_USER_ADD (u);
if (chan->cid.cid_num && !ast_strlen_zero(chan->cid.cid_num)) {
if (!ast_strlen_zero(chan->cid.cid_num)) {
if (option_verbose > 2)
ast_verbose (VERBOSE_PREFIX_3 "CallerID Present: Skipping\n");
} else {

16
apps/app_queue.c
Unescape View File

@ -2554,7 +2554,7 @@ static int pqm_exec(struct ast_channel *chan, void *data)
struct localuser *u;
char *queuename, *interface;
if (!data || ast_strlen_zero(data)) {
if (ast_strlen_zero(data)) {
ast_log(LOG_WARNING, "PauseQueueMember requires an argument ([queuename]|interface])\n");
return -1;
}
@ -2598,7 +2598,7 @@ static int upqm_exec(struct ast_channel *chan, void *data)
struct localuser *u;
char *queuename, *interface;
if (!data || ast_strlen_zero(data)) {
if (ast_strlen_zero(data)) {
ast_log(LOG_WARNING, "UnpauseQueueMember requires an argument ([queuename]|interface])\n");
return -1;
}
@ -2645,7 +2645,7 @@ static int rqm_exec(struct ast_channel *chan, void *data)
char tmpchan[256]="";
char *interface = NULL;
if (!data || ast_strlen_zero(data)) {
if (ast_strlen_zero(data)) {
ast_log(LOG_WARNING, "RemoveQueueMember requires an argument (queuename[|interface])\n");
return -1;
}
@ -2709,7 +2709,7 @@ static int aqm_exec(struct ast_channel *chan, void *data)
char *penaltys=NULL;
int penalty = 0;
if (!data || ast_strlen_zero(data)) {
if (ast_strlen_zero(data)) {
ast_log(LOG_WARNING, "AddQueueMember requires an argument (queuename[|[interface][|penalty]])\n");
return -1;
}
@ -2737,14 +2737,14 @@ static int aqm_exec(struct ast_channel *chan, void *data)
penaltys++;
}
}
if (!interface || ast_strlen_zero(interface)) {
if (ast_strlen_zero(interface)) {
ast_copy_string(tmpchan, chan->name, sizeof(tmpchan));
interface = strrchr(tmpchan, '-');
if (interface)
*interface = '\0';
interface = tmpchan;
}
if (penaltys && !ast_strlen_zero(penaltys)) {
if (!ast_strlen_zero(penaltys)) {
if ((sscanf(penaltys, "%d", &penalty) != 1) || penalty < 0) {
ast_log(LOG_WARNING, "Penalty '%s' is invalid, must be an integer >= 0\n", penaltys);
penalty = 0;
@ -2797,7 +2797,7 @@ static int queue_exec(struct ast_channel *chan, void *data)
/* Our queue entry */
struct queue_ent qe;
if (!data || ast_strlen_zero(data)) {
if (ast_strlen_zero(data)) {
ast_log(LOG_WARNING, "Queue requires an argument: queuename[|options[|URL][|announceoverride][|timeout]]\n");
return -1;
}
@ -3035,7 +3035,7 @@ static char *queue_function_qac(struct ast_channel *chan, char *cmd, char *data,
ast_copy_string(buf, "0", len);
if (!data || ast_strlen_zero(data)) {
if (ast_strlen_zero(data)) {
ast_log(LOG_ERROR, "QUEUEAGENTCOUNT requires an argument: queuename\n");
LOCAL_USER_REMOVE(u);
return buf;

2
apps/app_random.c
Unescape View File

@ -63,7 +63,7 @@ static int random_exec(struct ast_channel *chan, void *data)
char *prob;
int probint;
if (!data || ast_strlen_zero(data)) {
if (ast_strlen_zero(data)) {
ast_log(LOG_WARNING, "Random requires an argument ([probability]:[[context|]extension|]priority)\n");
return -1;
}

6
apps/app_read.c
Unescape View File

@ -89,7 +89,7 @@ static int read_exec(struct ast_channel *chan, void *data)
char *argcopy = NULL;
char *args[8];
if (!data || ast_strlen_zero(data)) {
if (ast_strlen_zero(data)) {
ast_log(LOG_WARNING, "Read requires an argument (variable)\n");
return -1;
}
@ -143,7 +143,7 @@ static int read_exec(struct ast_channel *chan, void *data)
to *= 1000;
}
if (!(filename) || ast_strlen_zero(filename))
if (ast_strlen_zero(filename))
filename = NULL;
if (maxdigitstr) {
maxdigits = atoi(maxdigitstr);
@ -152,7 +152,7 @@ static int read_exec(struct ast_channel *chan, void *data)
} else if (option_verbose > 2)
ast_verbose(VERBOSE_PREFIX_3 "Accepting a maximum of %d digits.\n", maxdigits);
}
if (!(varname) || ast_strlen_zero(varname)) {
if (ast_strlen_zero(varname)) {
ast_log(LOG_WARNING, "Invalid! Usage: Read(variable[|filename][|maxdigits][|option][|attempts][|timeout])\n\n");
LOCAL_USER_REMOVE(u);
return -1;

2
apps/app_readfile.c
Unescape View File

@ -63,7 +63,7 @@ static int readfile_exec(struct ast_channel *chan, void *data)
char *s, *varname=NULL, *file=NULL, *length=NULL, *returnvar=NULL;
int len=0;
if (!data || ast_strlen_zero(data)) {
if (ast_strlen_zero(data)) {
ast_log(LOG_WARNING, "ReadFile require an argument!\n");
return -1;
}

4
apps/app_realtime.c
Unescape View File

@ -130,7 +130,7 @@ static int realtime_update_exec(struct ast_channel *chan, void *data)
struct localuser *u;
int res = 0;
if (!data || ast_strlen_zero(data)) {
if (ast_strlen_zero(data)) {
ast_log(LOG_ERROR,"Invalid input: usage %s\n",UUSAGE);
return -1;
}
@ -171,7 +171,7 @@ static int realtime_exec(struct ast_channel *chan, void *data)
char *family=NULL, *colmatch=NULL, *value=NULL, *prefix=NULL, *vname=NULL;
size_t len;
if (!data || ast_strlen_zero(data)) {
if (ast_strlen_zero(data)) {
ast_log(LOG_ERROR,"Invalid input: usage %s\n",USAGE);
return -1;
}

2
apps/app_record.c
Unescape View File

@ -100,7 +100,7 @@ static int record_exec(struct ast_channel *chan, void *data)
int flags;
/* The next few lines of code parse out the filename and header from the input string */
if (!data || ast_strlen_zero(data)) { /* no data implies no filename or anything is present */
if (ast_strlen_zero(data)) { /* no data implies no filename or anything is present */
ast_log(LOG_WARNING, "Record requires an argument (filename)\n");
return -1;
}

2
apps/app_rpt.c
Unescape View File

@ -5839,7 +5839,7 @@ static int rpt_exec(struct ast_channel *chan, void *data)
ZT_PARAMS par;
int ms,elap;
if (!data || ast_strlen_zero((char *)data)) {
if (ast_strlen_zero(data)) {
ast_log(LOG_WARNING, "Rpt requires an argument (system node)\n");
return -1;
}

2
apps/app_senddtmf.c
Unescape View File

@ -62,7 +62,7 @@ static int senddtmf_exec(struct ast_channel *chan, void *data)
char *digits = NULL, *to = NULL;
int timeout = 250;
if (!data || ast_strlen_zero(data)) {
if (ast_strlen_zero(data)) {
ast_log(LOG_WARNING, "SendDTMF requires an argument (digits or *#aAbBcCdD)\n");
return 0;
}

2
apps/app_sendtext.c
Unescape View File

@ -71,7 +71,7 @@ static int sendtext_exec(struct ast_channel *chan, void *data)
struct localuser *u;
char *status = "UNSUPPORTED";
if (!data || ast_strlen_zero(data)) {
if (ast_strlen_zero(data)) {
ast_log(LOG_WARNING, "SendText requires an argument (text)\n");
return -1;
}

2
apps/app_setcallerid.c
Unescape View File

@ -106,7 +106,7 @@ static int setcallerid_exec(struct ast_channel *chan, void *data)
char *opt;
int anitoo = 0;
if (!data || ast_strlen_zero(data)) {
if (ast_strlen_zero(data)) {
ast_log(LOG_WARNING, "SetCallerID requires an argument!\n");
return 0;
}

2
apps/app_setcidname.c
Unescape View File

@ -70,7 +70,7 @@ static int setcallerid_exec(struct ast_channel *chan, void *data)
deprecation_warning = 1;
}
if (!data || ast_strlen_zero(data)) {
if (ast_strlen_zero(data)) {
ast_log(LOG_ERROR, "SetCIDName requires an argument!\n");
return 0;
}

4
apps/app_skel.c
Unescape View File

@ -72,7 +72,7 @@ static int app_exec(struct ast_channel *chan, void *data)
char *opts[2];
char *argv[2];
if (!data || ast_strlen_zero(data)) {
if (ast_strlen_zero(data)) {
ast_log(LOG_WARNING, "%s requires an argument (dummy|[options])\n",app);
LOCAL_USER_REMOVE(u);
return -1;
@ -96,7 +96,7 @@ static int app_exec(struct ast_channel *chan, void *data)
ast_parseoptions(app_opts, &flags, opts, options);
}
if (dummy && !ast_strlen_zero(dummy))
if (!ast_strlen_zero(dummy))
ast_log(LOG_NOTICE, "Dummy value is : %s\n", dummy);
if (ast_test_flag(&flags, OPTION_A))

2
apps/app_softhangup.c
Unescape View File

@ -61,7 +61,7 @@ static int softhangup_exec(struct ast_channel *chan, void *data)
char name[AST_CHANNEL_NAME] = "";
int all = 0;
if (!data || ast_strlen_zero(data)) {
if (ast_strlen_zero(data)) {
ast_log(LOG_WARNING, "SoftHangup requires an argument (Technology/resource)\n");
return 0;
}

2
apps/app_sql_postgres.c
Unescape View File

@ -504,7 +504,7 @@ static int PGSQL_exec(struct ast_channel *chan, void *data)
struct localuser *u;
int result;
if (!data || ast_strlen_zero(data)) {
if (ast_strlen_zero(data)) {
ast_log(LOG_WARNING, "APP_PGSQL requires an argument (see manual)\n");
return -1;
}

2
apps/app_system.c
Unescape View File

@ -90,7 +90,7 @@ static int system_exec_helper(struct ast_channel *chan, void *data, int failmode
int res=0;
struct localuser *u;
if (!data || ast_strlen_zero(data)) {
if (ast_strlen_zero(data)) {
ast_log(LOG_WARNING, "System requires an argument(command)\n");
pbx_builtin_setvar_helper(chan, chanvar, "FAILURE");
return failmode;

2
apps/app_talkdetect.c
Unescape View File

@ -78,7 +78,7 @@ static int background_detect_exec(struct ast_channel *chan, void *data)
int origrformat=0;
struct ast_dsp *dsp;
if (!data || ast_strlen_zero(data)) {
if (ast_strlen_zero(data)) {
ast_log(LOG_WARNING, "BackgroundDetect requires an argument (filename)\n");
return -1;
}

2
apps/app_test.c
Unescape View File

@ -137,7 +137,7 @@ static int testclient_exec(struct ast_channel *chan, void *data)
FILE *f;
/* Check for test id */
if (!testid || ast_strlen_zero(testid)) {
if (ast_strlen_zero(testid)) {
ast_log(LOG_WARNING, "TestClient requires an argument - the test id\n");
return -1;
}

2
apps/app_transfer.c
Unescape View File

@ -75,7 +75,7 @@ static int transfer_exec(struct ast_channel *chan, void *data)
char *dest = data;
char *status;
if (!dest || ast_strlen_zero(dest)) {
if (ast_strlen_zero(dest)) {
ast_log(LOG_WARNING, "Transfer requires an argument ([Tech/]destination)\n");
pbx_builtin_setvar_helper(chan, "TRANSFERSTATUS", "FAILURE");
return 0;

2
apps/app_txtcidname.c
Unescape View File

@ -71,7 +71,7 @@ static int txtcidname_exec(struct ast_channel *chan, void *data)
dep_warning = 1;
}
if (!data || ast_strlen_zero(data)) {
if (ast_strlen_zero(data)) {
ast_log(LOG_WARNING, "TXTCIDName requires an argument (extension)\n");
res = 1;
}

2
apps/app_url.c
Unescape View File

@ -81,7 +81,7 @@ static int sendurl_exec(struct ast_channel *chan, void *data)
char *stringp=NULL;
char *status = "FAILURE";
if (!data || ast_strlen_zero(data)) {
if (ast_strlen_zero(data)) {
ast_log(LOG_WARNING, "SendURL requires an argument (URL)\n");
pbx_builtin_setvar_helper(chan, "SENDURLSTATUS", status);
return -1;

2
apps/app_userevent.c
Unescape View File

@ -66,7 +66,7 @@ static int userevent_exec(struct ast_channel *chan, void *data)
char eventname[512];
char *eventbody;
if (!data || ast_strlen_zero(data)) {
if (ast_strlen_zero(data)) {
ast_log(LOG_WARNING, "UserEvent requires an argument (eventname|optional event body)\n");
return -1;
}

18
apps/app_voicemail.c
Unescape View File

@ -2973,7 +2973,7 @@ static void adsi_message(struct ast_channel *chan, struct vm_state *vms)
stringp = (char *)buf;
strsep(&stringp, "=");
val = strsep(&stringp, "=");
if (val && !ast_strlen_zero(val)) {
if (!ast_strlen_zero(val)) {
if (!strcmp((char *)buf, "callerid"))
ast_copy_string(cid, val, sizeof(cid));
if (!strcmp((char *)buf, "origdate"))
@ -3586,7 +3586,7 @@ static int play_message_category(struct ast_channel *chan, char *category)
{
int res = 0;
if (category && !ast_strlen_zero(category))
if (!ast_strlen_zero(category))
res = ast_play_and_wait(chan, category);
return res;
@ -4956,7 +4956,7 @@ static int vm_authenticate(struct ast_channel *chan, char *mailbox, int mailbox_
if (useadsi)
adsi_password(chan);
if (prefix && !ast_strlen_zero(prefix)) {
if (!ast_strlen_zero(prefix)) {
char fullusername[80] = "";
ast_copy_string(fullusername, prefix, sizeof(fullusername));
strncat(fullusername, mailbox, sizeof(fullusername) - 1 - strlen(fullusername));
@ -4987,7 +4987,7 @@ static int vm_authenticate(struct ast_channel *chan, char *mailbox, int mailbox_
else {
if (option_verbose > 2)
ast_verbose( VERBOSE_PREFIX_3 "Incorrect password '%s' for user '%s' (context = %s)\n", password, mailbox, context ? context : "<any>");
if (prefix && !ast_strlen_zero(prefix))
if (!ast_strlen_zero(prefix))
mailbox[0] = '\0';
}
logretries++;
@ -5051,7 +5051,7 @@ static int vm_execmain(struct ast_channel *chan, void *data)
if (chan->_state != AST_STATE_UP)
ast_answer(chan);
if (data && !ast_strlen_zero(data)) {
if (!ast_strlen_zero(data)) {
char *tmp;
int argc;
char *argv[2];
@ -5127,7 +5127,7 @@ static int vm_execmain(struct ast_channel *chan, void *data)
vms.heard = calloc(vmu->maxmsg, sizeof(int));
/* Set language from config to override channel language */
if (vmu->language && !ast_strlen_zero(vmu->language))
if (!ast_strlen_zero(vmu->language))
ast_copy_string(chan->language, vmu->language, sizeof(chan->language));
snprintf(vms.curdir, sizeof(vms.curdir), "%s/%s", VM_SPOOL_DIR, vmu->context);
mkdir(vms.curdir, 0700);
@ -5483,7 +5483,7 @@ static int vm_exec(struct ast_channel *chan, void *data)
if (chan->_state != AST_STATE_UP)
ast_answer(chan);
if (data && !ast_strlen_zero(data)) {
if (!ast_strlen_zero(data)) {
ast_copy_string(tmp, data, sizeof(tmp));
argc = ast_separate_app_args(tmp, '|', argv, sizeof(argv) / sizeof(argv[0]));
if (argc == 2) {
@ -5591,7 +5591,7 @@ static int vm_box_exists(struct ast_channel *chan, void *data)
struct ast_vm_user svm;
char *context, *box;
if (!data || ast_strlen_zero(data)) {
if (ast_strlen_zero(data)) {
ast_log(LOG_ERROR, "MailboxExists requires an argument: (vmbox[@context])\n");
return -1;
}
@ -5968,7 +5968,7 @@ static int load_config(void)
ast_log(LOG_DEBUG,"VM_CID Internal context string: %s\n",s);
stringp = ast_strdupa(s);
for (x = 0 ; x < MAX_NUM_CID_CONTEXTS ; x++){
if ((stringp)&&(!ast_strlen_zero(stringp))){
if (!ast_strlen_zero(stringp)) {
q = strsep(&stringp,",");
while ((*q == ' ')||(*q == '\t')) /* Eat white space between contexts */
q++;

2
apps/app_while.c
Unescape View File

@ -249,7 +249,7 @@ static int _while_exec(struct ast_channel *chan, void *data, int end)
memset(my_name, 0, size);
snprintf(my_name, size, "%s_%s_%d", chan->context, chan->exten, chan->priority);
if (!label || ast_strlen_zero(label)) {
if (ast_strlen_zero(label)) {
if (end)
label = used_index;
else if (!(label = pbx_builtin_getvar_helper(chan, my_name))) {

2
apps/app_zapateller.c
Unescape View File

@ -68,7 +68,7 @@ static int zapateller_exec(struct ast_channel *chan, void *data)
stringp=data;
c = strsep(&stringp, "|");
while(c && !ast_strlen_zero(c)) {
while(!ast_strlen_zero(c)) {
if (!strcasecmp(c, "answer"))
answer = 1;
else if (!strcasecmp(c, "nocallerid"))

2
apps/app_zapbarge.c
Unescape View File

@ -269,7 +269,7 @@ static int conf_exec(struct ast_channel *chan, void *data)
LOCAL_USER_ADD(u);
if (data && !ast_strlen_zero(data)) {
if (!ast_strlen_zero(data)) {
if ((sscanf(data, "Zap/%d", &confno) != 1) &&
(sscanf(data, "%d", &confno) != 1)) {
ast_log(LOG_WARNING, "ZapBarge Argument (if specified) must be a channel number, not '%s'\n", (char *)data);

Write Preview
Loading…
Cancel
Save