[nemiver] Kill build warnings
- From: Dodji Seketeli <dodji src gnome org>
- To: svn-commits-list gnome org
- Cc:
- Subject: [nemiver] Kill build warnings
- Date: Sat, 1 Aug 2009 10:34:05 +0000 (UTC)
commit efd622a0c888e86808a17235eecbbcfae52e9c45
Author: Dodji Seketeli <dodji redhat com>
Date: Sat Aug 1 11:48:08 2009 +0200
Kill build warnings
* src/uicommon/ephy-spinner.c (ephy_spinner_cache_get_type,
ephy_spinner_get_type):
Adjust to new layout of GTypeInfo.
(ephy_spinner_cache_get_images): Unsigned is always >=0.
(icon_theme_changed_cb): Make gcc quietly accept the unused
parameter.
* src/common/nmv-proc-utils.cc (launch_program): Check the return
value of dup.
src/common/nmv-proc-utils.cc | 6 ++++--
src/uicommon/ephy-spinner.c | 15 ++++++++-------
2 files changed, 12 insertions(+), 9 deletions(-)
---
diff --git a/src/common/nmv-proc-utils.cc b/src/common/nmv-proc-utils.cc
index d1a3208..a6ef190 100644
--- a/src/common/nmv-proc-utils.cc
+++ b/src/common/nmv-proc-utils.cc
@@ -96,13 +96,15 @@ launch_program (const std::vector<UString> &a_args,
//wire stderr to stderr_pipes[WRITE_PIPE] pipe
//******************************************
close (2) ;
- dup (stderr_pipes[WRITE_PIPE]) ;
+ int res = dup (stderr_pipes[WRITE_PIPE]);
+ RETURN_VAL_IF_FAIL (res > 0, false);
//*******************************************
//wire stdout to stdout_pipes[WRITE_PIPE] pipe
//******************************************
close (1) ;
- dup (stdout_pipes[WRITE_PIPE]) ;
+ res = dup (stdout_pipes[WRITE_PIPE]) ;
+ RETURN_VAL_IF_FAIL (res > 0, false);
//*****************************
//close the unnecessary pipes
diff --git a/src/uicommon/ephy-spinner.c b/src/uicommon/ephy-spinner.c
index 9cdce7c..e2b99d1 100644
--- a/src/uicommon/ephy-spinner.c
+++ b/src/uicommon/ephy-spinner.c
@@ -27,7 +27,7 @@
#include <gdk-pixbuf/gdk-pixbuf.h>
#include <gtk/gtk.h>
-#define LOG
+#define LOG(...)
/* Spinner cache implementation */
@@ -107,7 +107,8 @@ ephy_spinner_cache_get_type (void)
NULL,
sizeof (EphySpinnerCache),
0,
- (GInstanceInitFunc) ephy_spinner_cache_init
+ (GInstanceInitFunc) ephy_spinner_cache_init,
+ NULL,
};
type = g_type_register_static (G_TYPE_OBJECT,
@@ -379,7 +380,7 @@ ephy_spinner_cache_get_images (EphySpinnerCache *cache,
LOG ("Getting animation images for screen %p at size %d", screen, icon_size);
- g_return_val_if_fail (icon_size >= 0 && icon_size < LAST_ICON_SIZE, NULL);
+ g_return_val_if_fail (icon_size < LAST_ICON_SIZE, NULL);
/* Backward compat: "invalid" meant "native" size which doesn't exist anymore */
if (icon_size == GTK_ICON_SIZE_INVALID)
@@ -523,7 +524,8 @@ ephy_spinner_get_type (void)
NULL, /* class_data */
sizeof (EphySpinner),
0, /* n_preallocs */
- (GInstanceInitFunc) ephy_spinner_init
+ (GInstanceInitFunc) ephy_spinner_init,
+ NULL
};
type = g_type_register_static (GTK_TYPE_WIDGET,
@@ -569,7 +571,7 @@ ephy_spinner_unload_images (EphySpinner *spinner)
}
static void
-icon_theme_changed_cb (GtkIconTheme *icon_theme,
+icon_theme_changed_cb (GtkIconTheme *icon_theme __attribute__ ((unused)),
EphySpinner *spinner)
{
ephy_spinner_unload_images (spinner);
@@ -624,8 +626,7 @@ ephy_spinner_expose (GtkWidget *widget,
/* Otherwise |images| will be NULL anyway */
g_assert (images->n_animation_pixbufs > 0);
- g_assert (details->current_image >= 0 &&
- details->current_image < images->n_animation_pixbufs);
+ g_assert (details->current_image < images->n_animation_pixbufs);
pixbuf = images->animation_pixbufs[details->current_image];
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]