diff options
author | kpfleming <kpfleming@f38db490-d61c-443f-a65b-d21fe96a405b> | 2005-07-15 16:13:26 +0000 |
---|---|---|
committer | kpfleming <kpfleming@f38db490-d61c-443f-a65b-d21fe96a405b> | 2005-07-15 16:13:26 +0000 |
commit | 6b622ff869389c7569e5d925b730a20dec7b239a (patch) | |
tree | 1db95d25a9b95eb1fa6d0383ecc23595fd7fda65 | |
parent | 552eab0954f9803186ad644a7383726336a6009a (diff) |
ensure that format string macros are undef'd after use (bug #4716)
git-svn-id: http://svn.digium.com/svn/asterisk/trunk@6139 f38db490-d61c-443f-a65b-d21fe96a405b
-rwxr-xr-x | apps/app_groupcount.c | 1 | ||||
-rwxr-xr-x | channels/chan_zap.c | 4 | ||||
-rwxr-xr-x | file.c | 3 |
3 files changed, 6 insertions, 2 deletions
diff --git a/apps/app_groupcount.c b/apps/app_groupcount.c index ab31a3942..57c00c820 100755 --- a/apps/app_groupcount.c +++ b/apps/app_groupcount.c @@ -204,6 +204,7 @@ static int group_show_channels(int fd, int argc, char *argv[]) ast_cli(fd, "%d active channel%s\n", numchans, (numchans != 1) ? "s" : ""); return RESULT_SUCCESS; +#undef FORMAT_STRING } static char *tdesc = "Group Management Routines"; diff --git a/channels/chan_zap.c b/channels/chan_zap.c index 84ab23a18..892048ad8 100755 --- a/channels/chan_zap.c +++ b/channels/chan_zap.c @@ -9494,9 +9494,9 @@ static int zap_show_status(int fd, int argc, char *argv[]) { } close(ctl); - #undef FORMAT - #undef FORMAT2 return RESULT_SUCCESS; +#undef FORMAT +#undef FORMAT2 } static char show_channels_usage[] = @@ -1223,6 +1223,9 @@ static int show_file_formats(int fd, int argc, char *argv[]) }; ast_mutex_unlock(&formatlock); return RESULT_SUCCESS; +#undef FORMAT +#undef FORMAT2 + } struct ast_cli_entry show_file = |