main, refactor: reuse makeFileTag in read.c

Signed-off-by: Masatake YAMATO <yamato@redhat.com>
universal-ctags · Aug 6, 2015 · 97e10dd · 97e10dd
1 parent d0690f0
commit 97e10dd
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 14 deletions.
diff --git a/main/parse.c b/main/parse.c
@@ -1689,7 +1689,7 @@ extern void printLanguageList (void)
 *   File parsing
 */
 
-static void makeFileTag (const char *const fileName)
+extern void makeFileTag (const char *const fileName)
 {
 	if (Option.include.fileNames)
 	{

diff --git a/main/parse.h b/main/parse.h
@@ -132,6 +132,7 @@ extern parserDefinitionFunc PARSER_LIST;
 
 /* Language processing and parsing */
 extern void makeSimpleTag (const vString* const name, kindOption* const kinds, const int kind);
+extern void makeFileTag (const char *const fileName);
 extern parserDefinition* parserNew (const char* name);
 extern const char *getLanguageName (const langType language);
 extern char getLanguageFileKind (const langType language);

diff --git a/main/read.c b/main/read.c
@@ -229,20 +229,9 @@ static boolean parseLineDirective (void)
 								lineStr, lNum, vStringValue (fileName)); )
 			}
 
-			if (Option.include.fileNames && vStringLength (fileName) > 0 &&
+			if (vStringLength (fileName) > 0 &&
 				lNum == 1)
-			{
-				tagEntryInfo tag;
-				initTagEntry (&tag, baseFilename (vStringValue (fileName)));
-
-				tag.isFileEntry     = TRUE;
-				tag.lineNumberEntry = TRUE;
-				tag.lineNumber      = 1;
-				tag.kindName        = KIND_FILE_DEFAULT_LONG;
-				tag.kind            = getSourceLanguageFileKind();
-
-				makeTagEntry (&tag);
-			}
+				makeFileTag (vStringValue (fileName));
 			vStringDelete (fileName);
 			result = TRUE;
 		}