[dconf/wip/reorg] clean up C compiler warnings



commit 34ff3a2e7e6cf9b352e7f2bd0510aede86c06959
Author: Ryan Lortie <desrt desrt ca>
Date:   Sun Jul 8 22:01:03 2012 -0400

    clean up C compiler warnings
    
    Disable C compiler warnings entirely while building Vala code.
    
    Fix-up a couple of legitimate issues plus one false-positive
    (in service.c).

 bin/Makefile.am               |    4 +++-
 configure.ac                  |    4 ++++
 editor/Makefile.am            |    3 ++-
 engine/dconf-engine-profile.c |    2 +-
 service/service.c             |    2 +-
 tests/dbus.c                  |   10 ++++++----
 6 files changed, 17 insertions(+), 8 deletions(-)
---
diff --git a/bin/Makefile.am b/bin/Makefile.am
index b500f7a..d246cdd 100644
--- a/bin/Makefile.am
+++ b/bin/Makefile.am
@@ -6,7 +6,9 @@ bin_PROGRAMS = dconf
 
 dconf_VALAFLAGS = --vapidir ../client --pkg=gio-2.0 --pkg=posix --pkg=dconf
 
-dconf_CFLAGS = $(gio_CFLAGS)
+dconf_CFLAGS = \
+	$(gio_CFLAGS)		\
+	-w
 
 dconf_LDADD = \
 	../client/libdconf.so.0		\
diff --git a/configure.ac b/configure.ac
index 56bd4d9..fe6693c 100644
--- a/configure.ac
+++ b/configure.ac
@@ -16,8 +16,11 @@ if test "${CFLAGS+yes}" != "yes"; then
   CFLAGS='-O2 -g -Wall -Wwrite-strings -Wmissing-prototypes -fno-common'
 fi
 
+echo it was $CFLAGS
+
 # Check for programs
 AC_PROG_CC
+echo it is $CFLAGS
 AC_PROG_RANLIB
 AM_PROG_VALAC([0.15.1])
 
@@ -85,3 +88,4 @@ AC_CONFIG_FILES([
   Makefile
 ])
 AC_OUTPUT
+echo finally is $CFLAGS
diff --git a/editor/Makefile.am b/editor/Makefile.am
index 1a593c3..77df146 100644
--- a/editor/Makefile.am
+++ b/editor/Makefile.am
@@ -17,7 +17,8 @@ dconf_editor_CFLAGS = \
 	$(gtk_CFLAGS)			\
 	$(gee_CFLAGS)			\
 	$(libxml_CFLAGS)		\
-	-DPKGDATADIR=\"$(pkgdatadir)\"
+	-DPKGDATADIR=\"$(pkgdatadir)\"	\
+	-w
 
 dconf_editor_SOURCES = \
 	config.vapi		\
diff --git a/engine/dconf-engine-profile.c b/engine/dconf-engine-profile.c
index b499682..0413f32 100644
--- a/engine/dconf-engine-profile.c
+++ b/engine/dconf-engine-profile.c
@@ -20,7 +20,7 @@
  * Author: Ryan Lortie <desrt desrt ca>
  */
 
-#include "dconf-engine.h"
+#include "dconf-engine-profile.h"
 
 #include <string.h>
 #include <stdio.h>
diff --git a/service/service.c b/service/service.c
index 4c87477..22011d3 100644
--- a/service/service.c
+++ b/service/service.c
@@ -48,7 +48,7 @@ emit_notify_signal (GDBusConnection  *connection,
   if (n_keys > 1)
     {
       const gchar *last_reset = NULL;
-      gint last_reset_len;
+      gint last_reset_len = 0;
       gint i;
 
       for (i = 0; i < n_keys; i++)
diff --git a/tests/dbus.c b/tests/dbus.c
index 8f813a8..d8c54ad 100644
--- a/tests/dbus.c
+++ b/tests/dbus.c
@@ -342,6 +342,7 @@ test_signal_receipt (void)
 {
   GError *error = NULL;
   GVariant *reply;
+  gint status;
   gint i;
 
   reply = dconf_engine_dbus_call_sync_func (G_BUS_TYPE_SESSION,
@@ -352,10 +353,11 @@ test_signal_receipt (void)
   g_assert (reply != NULL);
   g_variant_unref (reply);
 
-  system ("gdbus emit --session "
-          "--object-path /ca/desrt/dconf/Writer/testcase "
-          "--signal ca.desrt.dconf.Writer.TestSignal "
-          "1 2 3");
+  status = system ("gdbus emit --session "
+                   "--object-path /ca/desrt/dconf/Writer/testcase "
+                   "--signal ca.desrt.dconf.Writer.TestSignal "
+                   "1 2 3");
+  g_assert_cmpint (status, ==, 0);
 
   /* total time: 30 seconds */
   for (i = 0; i < 300; i++)



[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]