diff options
| author | markster <markster@f38db490-d61c-443f-a65b-d21fe96a405b> | 2003-10-25 17:44:48 +0000 |
|---|---|---|
| committer | markster <markster@f38db490-d61c-443f-a65b-d21fe96a405b> | 2003-10-25 17:44:48 +0000 |
| commit | 79ab512ffd931a402ca29d279d670782b2cae1e4 (patch) | |
| tree | e072fcf5ebf3a8d22bbde69e9984f28b4ba291c2 /apps/app_cut.c | |
| parent | 5e3107ff41dfeb359367ff8ca8fa4bab59f20ed4 (diff) | |
Compatibility issues on app_cut (bug #428)
git-svn-id: http://svn.digium.com/svn/asterisk/trunk@1666 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'apps/app_cut.c')
| -rwxr-xr-x | apps/app_cut.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/apps/app_cut.c b/apps/app_cut.c index f04668929..0bb1ab71d 100755 --- a/apps/app_cut.c +++ b/apps/app_cut.c @@ -13,16 +13,16 @@ * */ +#include <stdio.h> +#include <stdlib.h> +#include <unistd.h> +#include <string.h> #include <asterisk/file.h> #include <asterisk/logger.h> #include <asterisk/options.h> #include <asterisk/channel.h> #include <asterisk/pbx.h> #include <asterisk/module.h> -#include <stdio.h> -#include <stdlib.h> -#include <unistd.h> -#include <string.h> /* Maximum length of any variable */ #define MAXRESULT 1024 @@ -58,7 +58,7 @@ static int cut_exec(struct ast_channel *chan, void *data) /* Check and parse arguments */ if (data) { - s = strdupa((char *)data); + s = ast_strdupa((char *)data); if (s) { newvar = strsep(&s, "="); if (newvar && (newvar[0] != '\0')) { @@ -131,7 +131,7 @@ static int cut_exec(struct ast_channel *chan, void *data) /* Get to start, if any */ if (num1 > 0) { - while ((tmp2 != NULL + 1) && (curfieldnum < num1)) { + while ((tmp2 != (char *)NULL + 1) && (curfieldnum < num1)) { tmp2 = index(tmp2, d) + 1; curfieldnum++; } @@ -143,7 +143,7 @@ static int cut_exec(struct ast_channel *chan, void *data) } /* Re-null tmp2 if we added 1 to NULL */ - if (tmp2 == NULL + 1) + if (tmp2 == (char *)NULL + 1) tmp2 = NULL; /* Output fields until we either run out of fields or num2 is reached */ |