From 0983566e565b1ac775fd10d76d71e06d43ceed07 Mon Sep 17 00:00:00 2001
From: Jerome Guelfucci <jeromeg@xfce.org>
Date: Fri, 27 Jun 2008 16:21:54 +0000
Subject: [PATCH] Fix gcc warnings and infinite loop.
(Old svn revision: 5001)
---
ChangeLog | 6 ++++++
src/Makefile.am | 4 ++--
src/main.c | 5 +++--
src/screenshooter-utils.c | 5 ++---
src/screenshooter-utils.h | 1 +
5 files changed, 14 insertions(+), 7 deletions(-)
diff --git a/ChangeLog b/ChangeLog
index 0049c702..8aceb58b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2008-06-27 jeromeg
+
+ * src/Makefile.am: enable -Wall
+ * src/{main.c, screenshooter-utils.{c,h}}: fix gcc warnings except one...
+ * BUGFIX: fix infinite loop in generate_filename_for_uri !
+
2008-06-27 jeromeg
* src/screenshooter-utils.c: clean generate_filename_for_uri using g_access.
diff --git a/src/Makefile.am b/src/Makefile.am
index 35c55fa2..fa702503 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -4,7 +4,7 @@ bin_PROGRAMS = xfce4-screenshooter
xfce4_screenshooter_plugin_CFLAGS = \
-DPACKAGE_LOCALE_DIR=\"$(localedir)\" \
- @LIBXFCE4PANEL_CFLAGS@
+ @LIBXFCE4PANEL_CFLAGS@ -Wall
xfce4_screenshooter_plugin_LDFLAGS = \
@LIBXFCE4PANEL_LIBS@
@@ -17,7 +17,7 @@ xfce4_screenshooter_CFLAGS = \
@GTK_CFLAGS@ \
@GLIB_CFLAGS@ \
@LIBXFCE4UTIL_CFLAGS@ \
- -DPACKAGE_LOCALE_DIR=\"$(localedir)\"
+ -DPACKAGE_LOCALE_DIR=\"$(localedir)\" -Wall
xfce4_screenshooter_LDFLAGS = \
@GTK_LIBS@ \
diff --git a/src/main.c b/src/main.c
index 15fa3f2f..f9a8d469 100644
--- a/src/main.c
+++ b/src/main.c
@@ -103,7 +103,7 @@ int main(int argc, char **argv)
gtk_dialog_set_default_response (GTK_DIALOG (chooser), GTK_RESPONSE_ACCEPT);
gtk_file_chooser_set_current_folder( GTK_FILE_CHOOSER ( chooser ), xfce_get_homedir () );
- filename = generate_filename_for_uri ( xfce_get_homedir () );
+ filename = generate_filename_for_uri ( g_strdup ( xfce_get_homedir () ) );
preview = gtk_image_new ();
gtk_file_chooser_set_current_name (GTK_FILE_CHOOSER (chooser), filename);
@@ -123,5 +123,6 @@ int main(int argc, char **argv)
gtk_widget_destroy(chooser);
g_free(filename);
+
+ return 0;
}
-
diff --git a/src/screenshooter-utils.c b/src/screenshooter-utils.c
index 61d1a16d..e95ef0e0 100644
--- a/src/screenshooter-utils.c
+++ b/src/screenshooter-utils.c
@@ -149,7 +149,6 @@ GdkPixbuf *take_screenshot (gint fullscreen, gint delay)
gchar *generate_filename_for_uri(char *uri)
{
- int test;
gchar *file_name;
unsigned int i = 0;
@@ -160,7 +159,7 @@ gchar *generate_filename_for_uri(char *uri)
file_name = g_strdup ("Screenshot.png");
- if( ( test = g_access ( g_build_filename (uri, file_name, NULL), F_OK ) ) != 0 )
+ if( g_access ( g_build_filename (uri, file_name, NULL), F_OK ) != 0 )
{
return file_name;
}
@@ -171,7 +170,7 @@ gchar *generate_filename_for_uri(char *uri)
g_free (file_name);
file_name = g_strdup_printf ("Screenshot-%d.png", i);
}
- while( ( test = g_access ( g_build_filename (uri, file_name, NULL), F_OK ) ) == -1 );
+ while( g_access ( g_build_filename (uri, file_name, NULL), F_OK ) == 0 );
return file_name;
}
diff --git a/src/screenshooter-utils.h b/src/screenshooter-utils.h
index 95dcc0f0..9fe93825 100644
--- a/src/screenshooter-utils.h
+++ b/src/screenshooter-utils.h
@@ -31,6 +31,7 @@
#include <gtk/gtk.h>
#include <gdk/gdkx.h>
+#include <glib/gstdio.h>
#include <fcntl.h>
#include <X11/Xatom.h>
--
GitLab