main, refactor: pass parserDefinition instance to its finalize callba…

…ck function Signed-off-by: Masatake YAMATO <yamato@redhat.com>
universal-ctags · Jan 21, 2016 · 48c8185 · 48c8185
1 parent 57391d5
commit 48c8185
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 4 deletions.
diff --git a/main/parse.c b/main/parse.c
@@ -1169,7 +1169,7 @@ extern void freeParserResources (void)
 		parserDefinition* const lang = LanguageTable [i];
 
 		if (lang->finalize)
-			(lang->finalize)((langType)i, (boolean)lang->initialized);
+			(lang->finalize)(lang, (boolean)lang->initialized);
 		if (lang->fileKind != &defaultFileKind)
 		{
 			eFree (lang->fileKind);
@@ -1198,7 +1198,7 @@ static rescanReason doNothing (parserDefinition *parser __unused__,
 
 static void lazyInitialize (parserDefinition* parser)
 {
-	Assert (0 <= parser->language  &&  parser->language < (int) LanguageCount);
+	Assert (0 <= parser->id  &&  parser->id < (int) LanguageCount);
 
 	parser->parser = doNothing;
 

diff --git a/main/parse.h b/main/parse.h
@@ -58,7 +58,7 @@ typedef void (*parserInitialize) (parserDefinition *parser);
    whether the assoiciated initializer is invoked or not with the
    second parameter: INITIALIZED. If it is true, the initializer
    is called. */
-typedef void (*parserFinalize) (langType language, boolean initialized);
+typedef void (*parserFinalize) (parserDefinition *parser, boolean initialized);
 
 typedef const char * (*selectLanguage) (FILE *);
 

diff --git a/parsers/tex.c b/parsers/tex.c
@@ -547,7 +547,7 @@ static void initialize (parserDefinition *parser)
 	lastSubSubS = vStringNew();
 }
 
-static void finalize (const langType language __unused__,
+static void finalize (parserDefinition *parser __unused__,
 		      boolean initialized)
 {
 	if (initialized)