kenmirrors/asterisk
1
0
Fork 0
mirror of https://github.com/asterisk/asterisk.git synced 2025-09-06 12:36:58 +00:00
Code Issues Packages Projects Releases Wiki Activity

ast_strlen_zero changes

Browse Source 
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@2921 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
James Golovich
2004-05-08 08:07:47 +00:00
parent 0ce20fea8a
commit 29718a5001
4 changed files with 13 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
apps/app_macro.c
View File

@@ -18,6 +18,7 @@
#include <asterisk/pbx.h> #include <asterisk/pbx.h>
#include <asterisk/module.h> #include <asterisk/module.h>
#include <asterisk/options.h> #include <asterisk/options.h>
#include <asterisk/utils.h>
#include <stdlib.h> #include <stdlib.h>
#include <unistd.h> #include <unistd.h>
#include <string.h> #include <string.h>
@@ -73,14 +74,14 @@ static int macro_exec(struct ast_channel *chan, void *data)
char *save_macro_priority; char *save_macro_priority;
char *save_macro_offset; char *save_macro_offset;
if (!data || !strlen(data)) { if (!data || ast_strlen_zero(data)) {
ast_log(LOG_WARNING, "Invalid Macro incantation\n"); ast_log(LOG_WARNING, "Invalid Macro incantation\n");
return 0; return 0;
} }
strncpy(tmp, data, sizeof(tmp) - 1); strncpy(tmp, data, sizeof(tmp) - 1);
rest = tmp; rest = tmp;
macro = strsep(&rest, "|"); macro = strsep(&rest, "|");
if (!macro || !strlen(macro)) { if (!macro || ast_strlen_zero(macro)) {
ast_log(LOG_WARNING, "Invalid macro name specified\n"); ast_log(LOG_WARNING, "Invalid macro name specified\n");
return 0; return 0;
} }
@@ -96,7 +97,7 @@ static int macro_exec(struct ast_channel *chan, void *data)
oldpriority = chan->priority; oldpriority = chan->priority;
strncpy(oldexten, chan->exten, sizeof(oldexten) - 1); strncpy(oldexten, chan->exten, sizeof(oldexten) - 1);
strncpy(oldcontext, chan->context, sizeof(oldcontext) - 1); strncpy(oldcontext, chan->context, sizeof(oldcontext) - 1);
if (!strlen(chan->macrocontext)) { if (ast_strlen_zero(chan->macrocontext)) {
strncpy(chan->macrocontext, chan->context, sizeof(chan->macrocontext) - 1); strncpy(chan->macrocontext, chan->context, sizeof(chan->macrocontext) - 1);
strncpy(chan->macroexten, chan->exten, sizeof(chan->macroexten) - 1); strncpy(chan->macroexten, chan->exten, sizeof(chan->macroexten) - 1);
chan->macropriority = chan->priority; chan->macropriority = chan->priority;

3
apps/app_zapbarge.c
View File

@@ -25,6 +25,7 @@
#include <asterisk/options.h> #include <asterisk/options.h>
#include <asterisk/cli.h> #include <asterisk/cli.h>
#include <asterisk/say.h> #include <asterisk/say.h>
#include <asterisk/utils.h>
#include <stdlib.h> #include <stdlib.h>
#include <unistd.h> #include <unistd.h>
#include <errno.h> #include <errno.h>
@@ -246,7 +247,7 @@ static int conf_exec(struct ast_channel *chan, void *data)
int confno = 0; int confno = 0;
char confstr[80]; char confstr[80];
if (data && strlen(data)) { if (data && !ast_strlen_zero(data)) {
if ((sscanf(data, "Zap/%d", &confno) != 1) && if ((sscanf(data, "Zap/%d", &confno) != 1) &&
(sscanf(data, "%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); ast_log(LOG_WARNING, "ZapBarge Argument (if specified) must be a channel number, not '%s'\n", (char *)data);

3
cdr/cdr_csv.c
View File

@@ -19,6 +19,7 @@
#include <asterisk/cdr.h> #include <asterisk/cdr.h>
#include <asterisk/module.h> #include <asterisk/module.h>
#include <asterisk/logger.h> #include <asterisk/logger.h>
#include <asterisk/utils.h>
#include "../asterisk.h" #include "../asterisk.h"
#include "../astconf.h" #include "../astconf.h"
@@ -224,7 +225,7 @@ static int csv_log(struct ast_cdr *cdr)
fclose(mf); fclose(mf);
mf = NULL; mf = NULL;
} }
if (strlen(cdr->accountcode)) { if (!ast_strlen_zero(cdr->accountcode)) {
if (writefile(buf, cdr->accountcode)) if (writefile(buf, cdr->accountcode))
ast_log(LOG_WARNING, "Unable to write CSV record to account file '%s'\n", cdr->accountcode); ast_log(LOG_WARNING, "Unable to write CSV record to account file '%s'\n", cdr->accountcode);
} }

9
pbx/pbx_spool.c
View File

@@ -18,6 +18,7 @@
#include <asterisk/pbx.h> #include <asterisk/pbx.h>
#include <asterisk/module.h> #include <asterisk/module.h>
#include <asterisk/options.h> #include <asterisk/options.h>
#include <asterisk/utils.h>
#include <pthread.h> #include <pthread.h>
#include <sys/stat.h> #include <sys/stat.h>
#include <errno.h> #include <errno.h>
@@ -109,9 +110,9 @@ static int apply_outgoing(struct outgoing *o, char *fn, FILE *f)
*c = '\0'; *c = '\0';
/* Trim trailing white space */ /* Trim trailing white space */
while(strlen(buf) && buf[strlen(buf) - 1] < 33) while(!ast_strlen_zero(buf) && buf[strlen(buf) - 1] < 33)
buf[strlen(buf) - 1] = '\0'; buf[strlen(buf) - 1] = '\0';
if (strlen(buf)) { if (!ast_strlen_zero(buf)) {
c = strchr(buf, ':'); c = strchr(buf, ':');
if (c) { if (c) {
*c = '\0'; *c = '\0';
@@ -187,7 +188,7 @@ static int apply_outgoing(struct outgoing *o, char *fn, FILE *f)
} }
} }
strncpy(o->fn, fn, sizeof(o->fn) - 1); strncpy(o->fn, fn, sizeof(o->fn) - 1);
if (!strlen(o->tech) || !strlen(o->dest) || (!strlen(o->app) && !strlen(o->exten))) { if (ast_strlen_zero(o->tech) || ast_strlen_zero(o->dest) || (ast_strlen_zero(o->app) && ast_strlen_zero(o->exten))) {
ast_log(LOG_WARNING, "At least one of app or extension must be specified, along with tech and dest in file %s\n", fn); ast_log(LOG_WARNING, "At least one of app or extension must be specified, along with tech and dest in file %s\n", fn);
return -1; return -1;
} }
@@ -219,7 +220,7 @@ static void *attempt_thread(void *data)
{ {
struct outgoing *o = data; struct outgoing *o = data;
int res, reason; int res, reason;
if (strlen(o->app)) { if (!ast_strlen_zero(o->app)) {
if (option_verbose > 2) if (option_verbose > 2)
ast_verbose(VERBOSE_PREFIX_3 "Attempting call on %s/%s for application %s(%s) (Retry %d)\n", o->tech, o->dest, o->app, o->data, o->retries); ast_verbose(VERBOSE_PREFIX_3 "Attempting call on %s/%s for application %s(%s) (Retry %d)\n", o->tech, o->dest, o->app, o->data, o->retries);
res = ast_pbx_outgoing_app(o->tech, AST_FORMAT_SLINEAR, o->dest, o->waittime * 1000, o->app, o->data, &reason, 2 /* wait to finish */, o->callerid, o->variable, o->account); res = ast_pbx_outgoing_app(o->tech, AST_FORMAT_SLINEAR, o->dest, o->waittime * 1000, o->app, o->data, &reason, 2 /* wait to finish */, o->callerid, o->variable, o->account);