[geany/geany] 76818f: Change getSourceFileName() to getInputFileName()

[Jiří Techet]

Branch:      refs/heads/master
Author:      Jiří Techet <techet at gmail.com>
Committer:   Jiří Techet <techet at gmail.com>
Date:        Sun, 07 Aug 2016 16:31:25 UTC
Commit:      76818f94394c5715ba08e31e9e39639279fc32ad
             https://github.com/geany/geany/commit/76818f94394c5715ba08e31e9e39639279fc32ad

Log Message:
-----------
Change getSourceFileName() to getInputFileName()


Modified Paths:
--------------
    ctags/main/read.c
    ctags/main/read.h
    ctags/parsers/rust.c

Modified: ctags/main/read.c
3 lines changed, 3 insertions(+), 0 deletions(-)
===================================================================
@@ -77,7 +77,10 @@ static void setSourceFileParameters (vString *const fileName, const langType lan
 {
 	if (File.source.name != NULL)
 		vStringDelete (File.source.name);
+	if (File.input.name != NULL)
+		vStringDelete (File.input.name);
 	File.source.name = fileName;
+	File.input.name = vStringNewCopy(fileName);
 
 	if (File.source.tagPath != NULL)
 		eFree (File.source.tagPath);


Modified: ctags/main/read.h
3 lines changed, 1 insertions(+), 2 deletions(-)
===================================================================
@@ -26,9 +26,8 @@
 *   MACROS
 */
 #define getInputLineNumber()    File.input.lineNumber
-#define getInputFileName()  vStringValue (File.source.name)
+#define getInputFileName()  vStringValue (File.input.name)
 #define getInputFilePosition()  File.filePosition
-#define getSourceFileName() vStringValue (File.source.name)
 #define getSourceFileTagPath()  vStringValue (File.source.tagPath)
 #define getSourceLanguage() File.source.language
 #define getSourceLanguageName() getLanguageName (File.source.language)


Modified: ctags/parsers/rust.c
2 lines changed, 1 insertions(+), 1 deletions(-)
===================================================================
@@ -443,7 +443,7 @@ static void addTag (vString* ident, const char* type, const char* arg_list, int
 
 	tag.lineNumber = line;
 	tag.filePosition = pos;
-	tag.sourceFileName = getSourceFileName();
+	tag.sourceFileName = getInputFileName();
 
 	tag.extensionFields.signature = arg_list;
 	tag.extensionFields.varType = type;



--------------
This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).