ensure that format string macros are undef'd after use (bug #4716)

git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@6139 65c4cc65-6c06-0410-ace0-fbb531ad65f3

diff --git a/apps/app_groupcount.c b/apps/app_groupcount.c
index ab31a3942ae7ff74b98a1324b9f360a38607cfe4..57c00c820201f1e3c86de7742514910abc18d9de 100755 (executable)
--- 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 84ab23a183560db97e8e49b5feb5e017e85c2647..892048ad8a9e66231eac5baf9eaccb2bb0c929c6 100755 (executable)
--- 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[] =

diff --git a/file.c b/file.c
index 9cb6d239376168ca5c7f948d45e9f6ef02d22e30..07c88d158e6fcd497492bcfc7ead2a90a41f1108 100755 (executable)
--- a/file.c
+++ b/file.c
@@ -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 =