[geany/geany] 448f1f: Make sure gboolean tm_source_file_parse() returns the right value

[Jiří Techet]

Branch:      refs/heads/master
Author:      Jiří Techet <techet at gmail.com>
Committer:   Jiří Techet <techet at gmail.com>
Date:        Wed, 05 Nov 2014 20:50:07 UTC
Commit:      448f1fd20ef8b640a4702e3d47da1fc086cad0b6
             https://github.com/geany/geany/commit/448f1fd20ef8b640a4702e3d47da1fc086cad0b6

Log Message:
-----------
Make sure gboolean tm_source_file_parse() returns the right value

Previously, after finishing the while loop TRUE was returned - this is
wrong because the while was running because parsing was unsuccessful.
Make it work the same way as in ctags (parser() always succeeds,
parser2() returns whether to retry or not).

(The return value actually isn't used, it's just to make sure we know
what we are doing.)


Modified Paths:
--------------
    tagmanager/src/tm_source_file.c

Modified: tagmanager/src/tm_source_file.c
13 lines changed, 7 insertions(+), 6 deletions(-)
===================================================================
@@ -246,7 +246,7 @@ gboolean tm_source_file_parse(TMSourceFile *source_file, guchar* text_buf, gint
 	gboolean use_buffer)
 {
 	const char *file_name;
-	gboolean status = TRUE;
+	gboolean retry = TRUE;
 
 	if ((NULL == source_file) || (NULL == source_file->file_name))
 	{
@@ -289,7 +289,7 @@ gboolean tm_source_file_parse(TMSourceFile *source_file, guchar* text_buf, gint
 	else
 	{
 		guint passCount = 0;
-		while ((TRUE == status) && (passCount < 3))
+		while (retry && passCount < 3)
 		{
 			tm_tags_array_free(source_file->tags_array, FALSE);
 			if (use_buffer && bufferOpen (text_buf, buf_size, file_name, source_file->lang))
@@ -298,10 +298,11 @@ gboolean tm_source_file_parse(TMSourceFile *source_file, guchar* text_buf, gint
 				{
 					LanguageTable [source_file->lang]->parser ();
 					bufferClose ();
+					retry = FALSE;
 					break;
 				}
 				else if (LanguageTable [source_file->lang]->parser2 != NULL)
-					status = LanguageTable [source_file->lang]->parser2 (passCount);
+					retry = LanguageTable [source_file->lang]->parser2 (passCount);
 				bufferClose ();
 			}
 			else if (!use_buffer && fileOpen (file_name, source_file->lang))
@@ -310,10 +311,11 @@ gboolean tm_source_file_parse(TMSourceFile *source_file, guchar* text_buf, gint
 				{
 					LanguageTable [source_file->lang]->parser ();
 					fileClose ();
+					retry = FALSE;
 					break;
 				}
 				else if (LanguageTable [source_file->lang]->parser2 != NULL)
-					status = LanguageTable [source_file->lang]->parser2 (passCount);
+					retry = LanguageTable [source_file->lang]->parser2 (passCount);
 				fileClose ();
 			}
 			else
@@ -323,9 +325,8 @@ gboolean tm_source_file_parse(TMSourceFile *source_file, guchar* text_buf, gint
 			}
 			++ passCount;
 		}
-		return TRUE;
 	}
-	return status;
+	return !retry;
 }
 
 



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