[geany/geany] bbbbb3: Rename fileReadLine() to readLineFromInputFile() - Commits

10 Sep 2016


      Branch:      refs/heads/master
Author:      Jiří Techet techet@gmail.com
Committer:   Jiří Techet techet@gmail.com
Date:        Sat, 30 Jul 2016 10:57:22 UTC
Commit:      bbbbb309baa0ff6a94f50437e99cc962aa7b047f
             https://github.com/geany/geany/commit/bbbbb309baa0ff6a94f50437e99cc962aa7b04...
Log Message:
-----------
Rename fileReadLine() to readLineFromInputFile()
Modified Paths:
--------------
    ctags/main/lregex.c
    ctags/main/read.c
    ctags/main/read.h
    ctags/parsers/abaqus.c
    ctags/parsers/abc.c
    ctags/parsers/asciidoc.c
    ctags/parsers/asm.c
    ctags/parsers/basic.c
    ctags/parsers/conf.c
    ctags/parsers/diff.c
    ctags/parsers/docbook.c
    ctags/parsers/erlang.c
    ctags/parsers/haxe.c
    ctags/parsers/latex.c
    ctags/parsers/lua.c
    ctags/parsers/markdown.c
    ctags/parsers/matlab.c
    ctags/parsers/nsis.c
    ctags/parsers/objc.c
    ctags/parsers/pascal.c
    ctags/parsers/perl.c
    ctags/parsers/python.c
    ctags/parsers/r.c
    ctags/parsers/rest.c
    ctags/parsers/ruby.c
    ctags/parsers/sh.c
    ctags/parsers/tcl.c
    ctags/parsers/txt2tags.c
Modified: ctags/main/lregex.c
2 lines changed, 1 insertions(+), 1 deletions(-)
===================================================================
@@ -531,7 +531,7 @@ extern boolean matchRegex (const vString* const line, const langType language)
 extern void findRegexTags (void)
 {
    /* merely read all lines of the file */
-	while (fileReadLine () != NULL)
+	while (readLineFromInputFile () != NULL)
    	;
 }
Modified: ctags/main/read.c
6 lines changed, 3 insertions(+), 3 deletions(-)
===================================================================
@@ -453,7 +453,7 @@ static vString *iFileGetLine (void)
    return result;
 }
-/*  Do not mix use of fileReadLine () and fileGetc () for the same file.
+/*  Do not mix use of readLineFromInputFile () and fileGetc () for the same file.
  */
 extern int getcFromInputFile (void)
 {
@@ -514,12 +514,12 @@ extern int skipToCharacterInInputFile (int c)
    return d;
 }
-/*  An alternative interface to fileGetc (). Do not mix use of fileReadLine()
+/*  An alternative interface to fileGetc (). Do not mix use of readLineFromInputFile()
  *  and fileGetc() for the same file. The returned string does not contain
  *  the terminating newline. A NULL return value means that all lines in the
  *  file have been read and we are at the end of file.
  */
-extern const unsigned char *fileReadLine (void)
+extern const unsigned char *readLineFromInputFile (void)
 {
    vString* const line = iFileGetLine ();
    const unsigned char* result = NULL;
Modified: ctags/main/read.h
2 lines changed, 1 insertions(+), 1 deletions(-)
===================================================================
@@ -110,7 +110,7 @@ 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 *fileReadLine (void);
+extern const unsigned char *readLineFromInputFile (void);
 extern char *readLine (vString *const vLine, MIO *const mio);
 extern char *readSourceLine (vString *const vLine, MIOPos location, long *const pSeekValue);
 extern boolean bufferOpen (unsigned char *buffer, size_t buffer_size,
Modified: ctags/parsers/abaqus.c
2 lines changed, 1 insertions(+), 1 deletions(-)
===================================================================
@@ -81,7 +81,7 @@ static void findAbaqusTags(void)
 {
    const char *line;
-	while ((line = (const char*)fileReadLine()) != NULL)
+	while ((line = (const char*)readLineFromInputFile()) != NULL)
    {
    	const char *cp = line;
Modified: ctags/parsers/abc.c
2 lines changed, 1 insertions(+), 1 deletions(-)
===================================================================
@@ -80,7 +80,7 @@ static void findAbcTags (void)
    vString *name = vStringNew();
    const unsigned char *line;
-	while ((line = fileReadLine()) != NULL)
+	while ((line = readLineFromInputFile()) != NULL)
    {
    	/*int name_len = vStringLength(name);*/
Modified: ctags/parsers/asciidoc.c
2 lines changed, 1 insertions(+), 1 deletions(-)
===================================================================
@@ -141,7 +141,7 @@ static void findAsciidocTags(void)
nestingLevels = nestingLevelsNew();
-	while ((line = fileReadLine()) != NULL)
+	while ((line = readLineFromInputFile()) != NULL)
    {
    	int line_len = strlen((const char*) line);
    	int name_len_bytes = vStringLength(name);
Modified: ctags/parsers/asm.c
2 lines changed, 1 insertions(+), 1 deletions(-)
===================================================================
@@ -260,7 +260,7 @@ static void findAsmTags (void)
    const unsigned char *line;
    boolean inCComment = FALSE;
-	while ((line = fileReadLine ()) != NULL)
+	while ((line = readLineFromInputFile ()) != NULL)
    {
    	const unsigned char *cp = line;
    	boolean labelCandidate = (boolean) (! isspace ((int) *cp));
Modified: ctags/parsers/basic.c
2 lines changed, 1 insertions(+), 1 deletions(-)
===================================================================
@@ -223,7 +223,7 @@ static void findBasicTags (void)
keywords = freebasic_keywords;
-	while ((line = (const char *) fileReadLine ()) != NULL)
+	while ((line = (const char *) readLineFromInputFile ()) != NULL)
    {
    	const char *p = line;
    	KeyWord const *kw;
Modified: ctags/parsers/conf.c
2 lines changed, 1 insertions(+), 1 deletions(-)
===================================================================
@@ -49,7 +49,7 @@ static void findConfTags (void)
    vString *scope = vStringNew ();
    const unsigned char *line;
-	while ((line = fileReadLine ()) != NULL)
+	while ((line = readLineFromInputFile ()) != NULL)
    {
    	const unsigned char* cp = line;
    	boolean possible = TRUE;
Modified: ctags/parsers/diff.c
2 lines changed, 1 insertions(+), 1 deletions(-)
===================================================================
@@ -82,7 +82,7 @@ static void findDiffTags (void)
    const unsigned char *line, *tmp;
    int delim = DIFF_DELIM_MINUS;
-	while ((line = fileReadLine ()) != NULL)
+	while ((line = readLineFromInputFile ()) != NULL)
    {
    	const unsigned char* cp = line;
Modified: ctags/parsers/docbook.c
2 lines changed, 1 insertions(+), 1 deletions(-)
===================================================================
@@ -86,7 +86,7 @@ static void findDocBookTags(void)
 {
    const char *line;
-	while ((line = (const char*)fileReadLine()) != NULL)
+	while ((line = (const char*)readLineFromInputFile()) != NULL)
    {
    	const char *cp = line;
Modified: ctags/parsers/erlang.c
2 lines changed, 1 insertions(+), 1 deletions(-)
===================================================================
@@ -160,7 +160,7 @@ static void findErlangTags (void)
    vString *const module = vStringNew ();
    const unsigned char *line;
-	while ((line = fileReadLine ()) != NULL)
+	while ((line = readLineFromInputFile ()) != NULL)
    {
    	const unsigned char *cp = line;
Modified: ctags/parsers/haxe.c
2 lines changed, 1 insertions(+), 1 deletions(-)
===================================================================
@@ -67,7 +67,7 @@ static void findHxTags (void)
const unsigned char *line;
-	while ((line = fileReadLine ()) != NULL)
+	while ((line = readLineFromInputFile ()) != NULL)
    {
    	const unsigned char *cp = line;
 another:
Modified: ctags/parsers/latex.c
2 lines changed, 1 insertions(+), 1 deletions(-)
===================================================================
@@ -134,7 +134,7 @@ static void findTeXTags(void)
 {
    const char *line;
-	while ((line = (const char*)fileReadLine()) != NULL)
+	while ((line = (const char*)readLineFromInputFile()) != NULL)
    {
    	const char *cp = line;
    	/*int escaped = 0;*/
Modified: ctags/parsers/lua.c
2 lines changed, 1 insertions(+), 1 deletions(-)
===================================================================
@@ -92,7 +92,7 @@ static void findLuaTags (void)
    vString *name = vStringNew ();
    const unsigned char *line;
-	while ((line = fileReadLine ()) != NULL)
+	while ((line = readLineFromInputFile ()) != NULL)
    {
    	const char *p, *q;
Modified: ctags/parsers/markdown.c
2 lines changed, 1 insertions(+), 1 deletions(-)
===================================================================
@@ -65,7 +65,7 @@ static void findMarkdownTags (void)
    vString *name = vStringNew();
    const unsigned char *line;
-	while ((line = fileReadLine()) != NULL)
+	while ((line = readLineFromInputFile()) != NULL)
    {
    	int name_len = vStringLength(name);
Modified: ctags/parsers/matlab.c
2 lines changed, 1 insertions(+), 1 deletions(-)
===================================================================
@@ -45,7 +45,7 @@ static void findMatlabTags (void)
    const unsigned char *line;
    const unsigned char *p;
-	while ((line = fileReadLine ()) != NULL)
+	while ((line = readLineFromInputFile ()) != NULL)
    {
    	int i, ic;
Modified: ctags/parsers/nsis.c
2 lines changed, 1 insertions(+), 1 deletions(-)
===================================================================
@@ -45,7 +45,7 @@ static void findNsisTags (void)
    vString *name = vStringNew ();
    const unsigned char *line;
-	while ((line = fileReadLine ()) != NULL)
+	while ((line = readLineFromInputFile ()) != NULL)
    {
    	const unsigned char* cp = line;
Modified: ctags/parsers/objc.c
6 lines changed, 3 insertions(+), 3 deletions(-)
===================================================================
@@ -221,7 +221,7 @@ static void eatComment (lexingState * st)
    	 * so we have to reload a line... */
    	if (c == NULL || *c == '\0')
    	{
-			st->cp = fileReadLine ();
+			st->cp = readLineFromInputFile ();
    		/* WOOPS... no more input...
    		 * we return, next lexing read
    		 * will be null and ok */
@@ -289,7 +289,7 @@ static objcKeyword lex (lexingState * st)
    /* handling data input here */
    while (st->cp == NULL || st->cp[0] == '\0')
    {
-		st->cp = fileReadLine ();
+		st->cp = readLineFromInputFile ();
    	if (st->cp == NULL)
    		return Tok_EOF;
@@ -1097,7 +1097,7 @@ static void findObjcTags (void)
    ignorePreprocStuff_escaped = FALSE;
st.name = vStringNew ();
-	st.cp = fileReadLine ();
+	st.cp = readLineFromInputFile ();
    toDoNext = &globalScope;
    tok = lex (&st);
    while (tok != Tok_EOF)
Modified: ctags/parsers/pascal.c
4 lines changed, 2 insertions(+), 2 deletions(-)
===================================================================
@@ -171,14 +171,14 @@ static void findPascalTags (void)
    							   is a FORWARD/EXTERN to be ignored, or
    							   whether it is a real tag */
-	dbp = fileReadLine ();
+	dbp = readLineFromInputFile ();
    while (dbp != NULL)
    {
    	int c = *dbp++;
if (c == '\0')          /* if end of line */
    	{
-			dbp = fileReadLine ();
+			dbp = readLineFromInputFile ();
    		if (dbp == NULL  ||  *dbp == '\0')
    			continue;
    		if (!((found_tag && verify_tag) || get_tagname))
Modified: ctags/parsers/perl.c
6 lines changed, 3 insertions(+), 3 deletions(-)
===================================================================
@@ -160,7 +160,7 @@ static boolean isSubroutineDeclaration (const unsigned char *cp)
    				}
    		}
    	}
-	} while (NULL != (cp = fileReadLine ()));
+	} while (NULL != (cp = readLineFromInputFile ()));
return FALSE;
 }
@@ -176,7 +176,7 @@ static void findPerlTags (void)
    boolean skipPodDoc = FALSE;
    const unsigned char *line;
-	while ((line = fileReadLine ()) != NULL)
+	while ((line = readLineFromInputFile ()) != NULL)
    {
    	boolean spaceRequired = FALSE;
    	boolean qualified = FALSE;
@@ -283,7 +283,7 @@ static void findPerlTags (void)
while (!*cp || '#' == *cp) { /* Gobble up empty lines
    			                            and comments */
-				cp = fileReadLine ();
+				cp = readLineFromInputFile ();
    			if (!cp)
    				goto END_MAIN_WHILE;
    			while (isspace (*cp))
Modified: ctags/parsers/python.c
4 lines changed, 2 insertions(+), 2 deletions(-)
===================================================================
@@ -311,7 +311,7 @@ static void parseClass (const char *cp, vString *const class,
    		if (*cp == '\0')
    		{
    			/* Closing parenthesis can be in follow up line. */
-				cp = (const char *) fileReadLine ();
+				cp = (const char *) readLineFromInputFile ();
    			if (!cp) break;
    			vStringPut (inheritance, ' ');
    			continue;
@@ -685,7 +685,7 @@ static void findPythonTags (void)
    int line_skip = 0;
    char const *longStringLiteral = NULL;
-	while ((line = (const char *) fileReadLine ()) != NULL)
+	while ((line = (const char *) readLineFromInputFile ()) != NULL)
    {
    	const char *cp = line, *candidate;
    	char const *longstring;
Modified: ctags/parsers/r.c
4 lines changed, 2 insertions(+), 2 deletions(-)
===================================================================
@@ -78,7 +78,7 @@ static void createRTags(void)
    int ikind;
    const unsigned char *line;
-	while ((line = fileReadLine()) != NULL)
+	while ((line = readLineFromInputFile()) != NULL)
    {
    	const unsigned char *cp = (const unsigned char*)line;
@@ -145,7 +145,7 @@ static void createRTags(void)
    							I don't know if there is a reason to write the function keyword
    							in a new line
    						*/
-							if ((line = fileReadLine()) != NULL) {
+							if ((line = readLineFromInputFile()) != NULL) {
    							cp = (const unsigned char*)line;
    							SKIPSPACE(cp);
    						}
Modified: ctags/parsers/rest.c
2 lines changed, 1 insertions(+), 1 deletions(-)
===================================================================
@@ -162,7 +162,7 @@ static void findRestTags (void)
    memset(kindchars, 0, sizeof kindchars);
    nestingLevels = nestingLevelsNew();
-	while ((line = fileReadLine ()) != NULL)
+	while ((line = readLineFromInputFile ()) != NULL)
    {
    	int line_len = strlen((const char*) line);
    	int name_len_bytes = vStringLength(name);
Modified: ctags/parsers/ruby.c
2 lines changed, 1 insertions(+), 1 deletions(-)
===================================================================
@@ -394,7 +394,7 @@ static void findRubyTags (void)
    *
    * if you wished, and this function would fail to recognize anything.
    */
-	while ((line = fileReadLine ()) != NULL)
+	while ((line = readLineFromInputFile ()) != NULL)
    {
    	const unsigned char *cp = line;
    	/* if we expect a separator after a while, for, or until statement
Modified: ctags/parsers/sh.c
2 lines changed, 1 insertions(+), 1 deletions(-)
===================================================================
@@ -54,7 +54,7 @@ static void findShTags (void)
    vString *name = vStringNew ();
    const unsigned char *line;
-	while ((line = fileReadLine ()) != NULL)
+	while ((line = readLineFromInputFile ()) != NULL)
    {
    	const unsigned char* cp = line;
    	boolean functionFound = FALSE;
Modified: ctags/parsers/tcl.c
2 lines changed, 1 insertions(+), 1 deletions(-)
===================================================================
@@ -72,7 +72,7 @@ static void findTclTags (void)
    vString *name = vStringNew ();
    const unsigned char *line;
-	while ((line = fileReadLine ()) != NULL)
+	while ((line = readLineFromInputFile ()) != NULL)
    {
    	const unsigned char *cp;
Modified: ctags/parsers/txt2tags.c
2 lines changed, 1 insertions(+), 1 deletions(-)
===================================================================
@@ -157,7 +157,7 @@ static void findTxt2tagsTags (void)
    vString *name = vStringNew();
    const unsigned char *line;
-	while ((line = fileReadLine()) != NULL)
+	while ((line = readLineFromInputFile()) != NULL)
    {
    	int depth;
--------------
This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).

    