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

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";

channels/chan_zap.c

@@ -9494,9 +9494,9 @@ static int zap_show_status(int fd, int argc, char *argv[]) {
 	}
 	close(ctl);
 
+	return RESULT_SUCCESS;
 #undef FORMAT
 #undef FORMAT2
-	return RESULT_SUCCESS;
 }
 
 static char show_channels_usage[] =

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 =