Make the private variables for various lexical analyzers static, so

[metze/wireshark/wip.git] / plugins / mate / mate_parser.l

diff --git a/plugins/mate/mate_parser.l b/plugins/mate/mate_parser.l
index f8d3076403277a046535cd2fee19e26cae0c7d03..3aeb2235bb53d8f5de8f20c7f99b12d82562d215 100644 (file)
--- a/plugins/mate/mate_parser.l
+++ b/plugins/mate/mate_parser.l
@@ -40,13 +40,13 @@
        void MateParseTrace(FILE*,char*);
        
 #define MAX_INCLUDE_DEPTH 10
-       YY_BUFFER_STATE include_stack[MAX_INCLUDE_DEPTH];
-       int include_stack_ptr = 0;
+       static YY_BUFFER_STATE include_stack[MAX_INCLUDE_DEPTH];
+       static int include_stack_ptr = 0;
        
-       void* pParser;
-       mate_config_frame* current_frame;
+       static void* pParser;
+       static mate_config_frame* current_frame;
        
-       mate_config* mc;
+       static mate_config* mc;
        
 #define MATE_PARSE(token_type) MateParser(pParser, (token_type), g_strdup(yytext), mc );
 
@@ -245,8 +245,8 @@ blk_cmnt_stop  "*/"
 
 %%
 
-extern gboolean mate_load_config(gchar* filename, mate_config* matecfg) {
-       gboolean state;
+extern gboolean mate_load_config(const gchar* filename, mate_config* matecfg) {
+       volatile gboolean state = TRUE;
        mc = matecfg;
 
        yyin = fopen(filename,"r");
@@ -283,7 +283,6 @@ extern gboolean mate_load_config(gchar* filename, mate_config* matecfg) {
                g_free(current_frame);
        
                g_ptr_array_free(mc->config_stack,FALSE);
-               state = TRUE;
        } CATCH(MateConfigError) {
                state = FALSE;
        } CATCH_ALL {