SF.net SVN: geany:[5797] trunk/src/search.c

[colombanw at users.sourceforge.net]

Revision: 5797
          http://geany.svn.sourceforge.net/geany/?rev=5797&view=rev
Author:   colombanw
Date:     2011-05-17 13:47:36 +0000 (Tue, 17 May 2011)

Log Message:
-----------
Make search.c:on_replace_dialog_response() a little more readable

Modified Paths:
--------------
    trunk/src/search.c

Modified: trunk/src/search.c
===================================================================
--- trunk/src/search.c	2011-05-11 22:52:05 UTC (rev 5796)
+++ trunk/src/search.c	2011-05-17 13:47:36 UTC (rev 5797)
@@ -1362,14 +1362,7 @@
 
 	if ((response != GEANY_RESPONSE_FIND) && (search_flags_re & SCFIND_MATCHCASE)
 		&& (strcmp(find, replace) == 0))
-	{
-		fail:
-		utils_beep();
-		gtk_widget_grab_focus(replace_dlg.find_entry);
-		g_free(find);
-		g_free(replace);
-		return;
-	}
+		goto fail;
 	if (search_flags_re & SCFIND_REGEXP)
 	{
 		if (! utils_str_replace_escape(find, TRUE) ||
@@ -1435,6 +1428,13 @@
 	}
 	g_free(find);
 	g_free(replace);
+	return;
+
+fail:
+	utils_beep();
+	gtk_widget_grab_focus(replace_dlg.find_entry);
+	g_free(find);
+	g_free(replace);
 }
 
 


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.