SF.net SVN: geany:[4138] trunk

[eht16 at users.sourceforge.net]

Revision: 4138
          http://geany.svn.sourceforge.net/geany/?rev=4138&view=rev
Author:   eht16
Date:     2009-08-29 18:44:14 +0000 (Sat, 29 Aug 2009)

Log Message:
-----------
Fix compiler warnings.

Modified Paths:
--------------
    trunk/ChangeLog
    trunk/src/build.c
    trunk/src/filetypes.c

Modified: trunk/ChangeLog
===================================================================
--- trunk/ChangeLog	2009-08-27 16:31:53 UTC (rev 4137)
+++ trunk/ChangeLog	2009-08-29 18:44:14 UTC (rev 4138)
@@ -1,3 +1,9 @@
+2009-08-29  Enrico Tröger  <enrico(dot)troeger(at)uvena(dot)de>
+
+ * src/build.c, src/filetypes.c:
+   Fix compiler warnings.
+
+
 2009-08-27  Nick Treleaven  <nick(dot)treleaven(at)btinternet(dot)com>
 
  * src/keybindings.c:

Modified: trunk/src/build.c
===================================================================
--- trunk/src/build.c	2009-08-27 16:31:53 UTC (rev 4137)
+++ trunk/src/build.c	2009-08-29 18:44:14 UTC (rev 4138)
@@ -1392,7 +1392,7 @@
 					else
 					{
 						GtkWidget *image;
-						exec_running = run_info[cmd].pid>1;
+						exec_running = run_info[cmd].pid > (GPid) 1;
 						cmd_sensitivity = bc!=NULL || exec_running;
 						gtk_widget_set_sensitive(menu_item, cmd_sensitivity);
 						if (cmd==GBO_TO_CMD(GEANY_GBO_EXEC)) run_sensitivity = cmd_sensitivity;

Modified: trunk/src/filetypes.c
===================================================================
--- trunk/src/filetypes.c	2009-08-27 16:31:53 UTC (rev 4137)
+++ trunk/src/filetypes.c	2009-08-29 18:44:14 UTC (rev 4138)
@@ -1375,21 +1375,26 @@
 	gchar *regstr;
 	gchar **tmp;
 	GeanyDocument *doc;
-	if(ft==NULL)
+#ifdef HAVE_REGCOMP
+	regex_t *regex;
+	regmatch_t pmatch[3];
+#endif
+	if (ft == NULL)
 	{
 		doc = document_get_current();
-		if(doc!=NULL)ft = doc->file_type;
+		if (doc != NULL)
+			ft = doc->file_type;
 	}
 	tmp = build_get_regex(build_info.grp, ft, NULL);
-	if (tmp==NULL) return FALSE;
+	if (tmp == NULL)
+		return FALSE;
 	regstr = *tmp;
 #ifndef HAVE_REGCOMP
 	if (!NZV(regstr))
 		geany_debug("No regex support - maybe you should configure with --enable-gnu-regex!");
 	return FALSE;
 #else
-	regex_t *regex = &ft->priv->error_regex;
-	regmatch_t pmatch[3];
+	regex = &ft->priv->error_regex;
 
 	*filename = NULL;
 	*line = -1;


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