Branch: refs/heads/master Author: Jiří Techet techet@gmail.com Committer: Jiří Techet techet@gmail.com Date: Mon, 10 Oct 2016 22:45:15 UTC Commit: 2f4d43ac93e79fd97cec8ccaefe70d644cfb50a3 https://github.com/geany/geany/commit/2f4d43ac93e79fd97cec8ccaefe70d644cfb50...
Log Message: ----------- read: Some function renaming
Modified Paths: -------------- ctags/main/parse.c ctags/main/read.c ctags/main/read.h src/tagmanager/tm_ctags_wrappers.c
Modified: ctags/main/parse.c 4 lines changed, 2 insertions(+), 2 deletions(-) =================================================================== @@ -574,7 +574,7 @@ static bool createTagsForFile (const char *const fileName, { bool retried = false;
- if (fileOpen (fileName, language)) + if (openInputFile (fileName, language)) {
makeFileTag (fileName); @@ -585,7 +585,7 @@ static bool createTagsForFile (const char *const fileName, retried = LanguageTable [language]->parser2 (passCount);
- fileClose (); + closeInputFile (); }
return retried;
Modified: ctags/main/read.c 6 lines changed, 3 insertions(+), 3 deletions(-) =================================================================== @@ -207,7 +207,7 @@ extern unsigned long getSourceLineNumber (void) return File.source.lineNumber; }
-extern void freeSourceFileResources (void) +extern void freeInputFileResources (void) { vStringDelete (File.input.name); vStringDelete (File.path); @@ -404,7 +404,7 @@ static bool parseLineDirective (char *s) /* This function opens an input file, and resets the line counter. If it * fails, it will display an error message and leave the File.mio set to NULL. */ -extern bool fileOpen (const char *const fileName, const langType language) +extern bool openInputFile (const char *const fileName, const langType language) { const char *const openMode = "rb"; bool opened = false; @@ -487,7 +487,7 @@ extern bool bufferOpen (unsigned char *buffer, size_t buffer_size, return opened; }
-extern void fileClose (void) +extern void closeInputFile (void) { if (File.mio != NULL) {
Modified: ctags/main/read.h 12 lines changed, 6 insertions(+), 6 deletions(-) =================================================================== @@ -69,24 +69,24 @@ extern bool doesInputLanguageAllowNullTag (void); extern kindOption *getInputLanguageFileKind (void); extern bool doesInputLanguageRequestAutomaticFQTag (void);
-extern void freeSourceFileResources (void); -extern bool fileOpen (const char *const fileName, const langType language); -extern void fileClose (void); +extern void freeInputFileResources (void); +extern bool openInputFile (const char *const fileName, const langType language); +extern void closeInputFile (void); extern int getcFromInputFile (void); extern int getNthPrevCFromInputFile (unsigned int nth, int def); extern int skipToCharacterInInputFile (int c); extern void ungetcToInputFile (int c); extern const unsigned char *readLineFromInputFile (void); -extern char *readLineRaw (vString *const vLine, MIO *const mio); -extern char *readSourceLine (vString *const vLine, MIOPos location, long *const pSeekValue); extern bool bufferOpen (unsigned char *buffer, size_t buffer_size, const char *const fileName, const langType language ); -#define bufferClose fileClose
extern const char *getSourceFileTagPath (void); extern const char *getSourceLanguageName (void); extern unsigned long getSourceLineNumber (void);
+/* Raw: reading from given a parameter, fp */ +extern char *readLineRaw (vString *const vLine, MIO *const mio); + /* Bypass: reading from fp in inputFile WITHOUT updating fields in input fields */ extern char *readLineFromBypass (vString *const vLine, MIOPos location, long *const pSeekValue);
Modified: src/tagmanager/tm_ctags_wrappers.c 10 lines changed, 5 insertions(+), 5 deletions(-) =================================================================== @@ -69,31 +69,31 @@ void tm_ctags_parse(guchar *buffer, gsize buffer_size, while (retry && passCount < 3) { pass_callback(user_data); - if (!buffer && fileOpen (file_name, lang)) + if (!buffer && openInputFile (file_name, lang)) { if (LanguageTable [lang]->parser != NULL) { LanguageTable [lang]->parser (); - fileClose (); + closeInputFile (); retry = FALSE; break; } else if (LanguageTable [lang]->parser2 != NULL) retry = LanguageTable [lang]->parser2 (passCount); - fileClose (); + closeInputFile (); } else if (buffer && bufferOpen (buffer, buffer_size, file_name, lang)) { if (LanguageTable [lang]->parser != NULL) { LanguageTable [lang]->parser (); - bufferClose (); + closeInputFile (); retry = FALSE; break; } else if (LanguageTable [lang]->parser2 != NULL) retry = LanguageTable [lang]->parser2 (passCount); - bufferClose (); + closeInputFile (); } else {
-------------- This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).