SF.net SVN: geany: [1709] trunk

[eht16 at users.sourceforge.net]

Revision: 1709
          http://svn.sourceforge.net/geany/?rev=1709&view=rev
Author:   eht16
Date:     2007-07-17 01:10:29 -0700 (Tue, 17 Jul 2007)

Log Message:
-----------
Fix warnings about shadowing local variables.

Modified Paths:
--------------
    trunk/ChangeLog
    trunk/src/callbacks.c
    trunk/src/ui_utils.c
    trunk/src/utils.c

Modified: trunk/ChangeLog
===================================================================
--- trunk/ChangeLog	2007-07-17 08:09:15 UTC (rev 1708)
+++ trunk/ChangeLog	2007-07-17 08:10:29 UTC (rev 1709)
@@ -4,6 +4,8 @@
    Improve selection handling when decreasing indent by one space.
    Avoid using SCI_DELETEBACK for simple text removal.
    Fix a typo in is_doc_comment_char().
+ * src/callbacks.c, src/ui_utils.c, src/utils.c:
+   Fix warnings about shadowing local variables.
 
 
 2007-07-16  Enrico Tröger  <enrico.troeger at uvena.de>

Modified: trunk/src/callbacks.c
===================================================================
--- trunk/src/callbacks.c	2007-07-17 08:09:15 UTC (rev 1708)
+++ trunk/src/callbacks.c	2007-07-17 08:10:29 UTC (rev 1709)
@@ -474,7 +474,7 @@
                                         gpointer         user_data)
 {
 	gint idx = document_get_cur_idx();
-	gchar *basename;
+	gchar *base_name;
 	gint i = GPOINTER_TO_INT(user_data);
 	gchar *charset = NULL;
 
@@ -486,16 +486,16 @@
 		charset = encodings[i].charset;
 	}
 
-	basename = g_path_get_basename(doc_list[idx].file_name);
+	base_name = g_path_get_basename(doc_list[idx].file_name);
 	if (dialogs_show_question_full(NULL, _("_Reload"), GTK_STOCK_CANCEL,
 		_("Any unsaved changes will be lost."),
-		_("Are you sure you want to reload '%s'?"), basename))
+		_("Are you sure you want to reload '%s'?"), base_name))
 	{
 		document_reload_file(idx, charset);
 		if (charset != NULL)
 			ui_update_statusbar(idx, -1);
 	}
-	g_free(basename);
+	g_free(base_name);
 }
 
 

Modified: trunk/src/ui_utils.c
===================================================================
--- trunk/src/ui_utils.c	2007-07-17 08:09:15 UTC (rev 1708)
+++ trunk/src/ui_utils.c	2007-07-17 08:10:29 UTC (rev 1709)
@@ -167,13 +167,13 @@
 			g_string_append(str, DOC_FILENAME(idx));
 		else
 		{
-			gchar *basename = g_path_get_basename(DOC_FILENAME(idx));
+			gchar *base_name = g_path_get_basename(DOC_FILENAME(idx));
 			gchar *dirname = g_path_get_dirname(DOC_FILENAME(idx));
 
-			g_string_append(str, basename);
+			g_string_append(str, base_name);
 			g_string_append(str, " - ");
 			g_string_append(str, dirname ? dirname : "");
-			g_free(basename);
+			g_free(base_name);
 			g_free(dirname);
 		}
 		g_string_append(str, " - ");

Modified: trunk/src/utils.c
===================================================================
--- trunk/src/utils.c	2007-07-17 08:09:15 UTC (rev 1708)
+++ trunk/src/utils.c	2007-07-17 08:10:29 UTC (rev 1709)
@@ -348,12 +348,12 @@
 	}
 	else if (doc_list[idx].mtime < st.st_mtime)
 	{
-		gchar *basename = g_path_get_basename(doc_list[idx].file_name);
+		gchar *base_name = g_path_get_basename(doc_list[idx].file_name);
 
 		if (dialogs_show_question_full(NULL, _("_Reload"), GTK_STOCK_CANCEL,
 			_("Do you want to reload it?"),
 			_("The file '%s' on the disk is more recent than\n"
-				"the current buffer."), basename))
+				"the current buffer."), base_name))
 		{
 			document_reload_file(idx, NULL);
 			doc_list[idx].last_check = t;
@@ -361,7 +361,7 @@
 		else
 			doc_list[idx].mtime = st.st_mtime;
 
-		g_free(basename);
+		g_free(base_name);
 		ret = TRUE; // file has changed
 	}
 	g_free(locale_filename);


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