aboutsummaryrefslogtreecommitdiffstats
path: root/apps/app_macro.c
diff options
context:
space:
mode:
authorcitats <citats@f38db490-d61c-443f-a65b-d21fe96a405b>2004-05-08 08:07:47 +0000
committercitats <citats@f38db490-d61c-443f-a65b-d21fe96a405b>2004-05-08 08:07:47 +0000
commit01b65e2f0946e20b6e74ee19140487813e41ee57 (patch)
treea623ef4c57358b84f6ee14266ae684153cd38f4c /apps/app_macro.c
parent1c7659937336b56c7382a59cc2f492a38013fa63 (diff)
ast_strlen_zero changes
git-svn-id: http://svn.digium.com/svn/asterisk/trunk@2921 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'apps/app_macro.c')
-rwxr-xr-xapps/app_macro.c7
1 files changed, 4 insertions, 3 deletions
diff --git a/apps/app_macro.c b/apps/app_macro.c
index 3189d077b..781217337 100755
--- a/apps/app_macro.c
+++ b/apps/app_macro.c
@@ -18,6 +18,7 @@
#include <asterisk/pbx.h>
#include <asterisk/module.h>
#include <asterisk/options.h>
+#include <asterisk/utils.h>
#include <stdlib.h>
#include <unistd.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_offset;
- if (!data || !strlen(data)) {
+ if (!data || ast_strlen_zero(data)) {
ast_log(LOG_WARNING, "Invalid Macro incantation\n");
return 0;
}
strncpy(tmp, data, sizeof(tmp) - 1);
rest = tmp;
macro = strsep(&rest, "|");
- if (!macro || !strlen(macro)) {
+ if (!macro || ast_strlen_zero(macro)) {
ast_log(LOG_WARNING, "Invalid macro name specified\n");
return 0;
}
@@ -96,7 +97,7 @@ static int macro_exec(struct ast_channel *chan, void *data)
oldpriority = chan->priority;
strncpy(oldexten, chan->exten, sizeof(oldexten) - 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->macroexten, chan->exten, sizeof(chan->macroexten) - 1);
chan->macropriority = chan->priority;