GNOME.org
 

[gnome-color-manager] Use more GNOME_COMPILE_WARNINGS

commit 1af53aa5099382e24ab805621ff5cde006d8c6c0
Author: Richard Hughes <richard hughsie com>
Date:   Mon Aug 15 10:54:02 2016 +0100

    Use more GNOME_COMPILE_WARNINGS

 configure.ac               |   68 +++++++++++++++-----------------------------
 src/Makefile.am            |   14 ++++----
 src/gcm-calibrate-argyll.c |    8 ++--
 src/gcm-calibrate-main.c   |   12 ++++----
 src/gcm-inspect.c          |    6 ++--
 src/gcm-picker.c           |    4 +-
 src/gcm-print.c            |    4 +-
 src/gcm-viewer.c           |   10 +++---
 8 files changed, 52 insertions(+), 74 deletions(-)
---
diff --git a/configure.ac b/configure.ac
index 844ad96..4e4b476 100644
--- a/configure.ac
+++ b/configure.ac
@@ -22,51 +22,29 @@ YELP_HELP_INIT
 # validate AppData
 APPSTREAM_XML
 
-GNOME_COMPILE_WARNINGS(error)
-
-AC_ARG_ENABLE(strict, AS_HELP_STRING([--enable-strict],[Enable strict compilation options]), 
enable_strict=$enableval,
-                                       enable_strict=no)
-if test x$enable_strict != xno; then
-       if test "$GCC" = "yes"; then
-               CPPFLAGS="$CPPFLAGS -Werror"
-       fi
-fi
-
-dnl ---------------------------------------------------------------------------
-dnl - Extra verbose warning switches
-dnl ---------------------------------------------------------------------------
-
-if test "$GCC" = "yes"; then
-       WARNINGFLAGS_C="$WARNINGFLAGS_C -Wall"
-       WARNINGFLAGS_C="$WARNINGFLAGS_C -Wcast-align -Wno-uninitialized"
-       WARNINGFLAGS_C="$WARNINGFLAGS_C -Wmissing-declarations"
-#      WARNINGFLAGS_C="$WARNINGFLAGS_C -Wredundant-decls"
-       WARNINGFLAGS_C="$WARNINGFLAGS_C -Wpointer-arith"
-       WARNINGFLAGS_C="$WARNINGFLAGS_C -Wcast-align"
-       WARNINGFLAGS_C="$WARNINGFLAGS_C -Wwrite-strings"
-       WARNINGFLAGS_C="$WARNINGFLAGS_C -Winit-self"
-       WARNINGFLAGS_C="$WARNINGFLAGS_C -Wreturn-type"
-       WARNINGFLAGS_C="$WARNINGFLAGS_C -Wformat-nonliteral"
-       WARNINGFLAGS_C="$WARNINGFLAGS_C -Wformat-security"
-       WARNINGFLAGS_C="$WARNINGFLAGS_C -Wmissing-include-dirs"
-       WARNINGFLAGS_C="$WARNINGFLAGS_C -Wmissing-format-attribute"
-       WARNINGFLAGS_C="$WARNINGFLAGS_C -Wclobbered"
-       WARNINGFLAGS_C="$WARNINGFLAGS_C -Wempty-body"
-       WARNINGFLAGS_C="$WARNINGFLAGS_C -Wignored-qualifiers"
-       WARNINGFLAGS_C="$WARNINGFLAGS_C -Wsign-compare"
-       WARNINGFLAGS_C="$WARNINGFLAGS_C -Wtype-limits"
-       WARNINGFLAGS_C="$WARNINGFLAGS_C -Wuninitialized"
-       WARNINGFLAGS_C="$WARNINGFLAGS_C -Waggregate-return"
-       WARNINGFLAGS_C="$WARNINGFLAGS_C -Wdeclaration-after-statement"
-       WARNINGFLAGS_C="$WARNINGFLAGS_C -Wshadow"
-       WARNINGFLAGS_C="$WARNINGFLAGS_C -Wno-strict-aliasing"
-       WARNINGFLAGS_C="$WARNINGFLAGS_C -Winline"
-       WARNINGFLAGS_C="$WARNINGFLAGS_C -Wmissing-parameter-type"
-       WARNINGFLAGS_C="$WARNINGFLAGS_C -Woverride-init"
-else
-       WARNINGFLAGS_C=""
-fi
-AC_SUBST(WARNINGFLAGS_C)
+GNOME_COMPILE_WARNINGS([maximum],[
+       -Wmissing-declarations
+       -Wcast-align
+       -Wwrite-strings
+       -Wreturn-type
+       -Wformat-nonliteral
+       -Wmissing-format-attribute
+       -Wclobbered
+       -Wempty-body
+       -Wignored-qualifiers
+       -Wsign-compare
+       -Wtype-limits
+       -Wuninitialized
+       -Waggregate-return
+       -Wdeclaration-after-statement
+       -Wshadow
+       -Wno-strict-aliasing
+       -Winline
+       -Wmissing-parameter-type
+       -Woverride-init
+       -Wno-discarded-qualifiers
+       -Wformat-signedness
+])
 
 dnl ---------------------------------------------------------------------------
 dnl - gettext stuff
diff --git a/src/Makefile.am b/src/Makefile.am
index 5d984c2..d7b144d 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -36,7 +36,7 @@ libgcmshared_a_SOURCES =                              \
        gcm-utils.h
 
 libgcmshared_a_CFLAGS =                                        \
-       $(WARNINGFLAGS_C)
+       $(WARN_CFLAGS)
 
 bin_PROGRAMS =                                         \
        gcm-inspect                                     \
@@ -80,7 +80,7 @@ gcm_calibrate_LDADD =                                 \
        -lm
 
 gcm_calibrate_CFLAGS =                                 \
-       $(WARNINGFLAGS_C)
+       $(WARN_CFLAGS)
 
 gcm_inspect_SOURCES =                                  \
        gcm-inspect.c
@@ -96,7 +96,7 @@ gcm_inspect_LDADD =                                   \
        -lm
 
 gcm_inspect_CFLAGS =                                   \
-       $(WARNINGFLAGS_C)
+       $(WARN_CFLAGS)
 
 gcm_import_SOURCES =                                   \
        gcm-import.c
@@ -112,7 +112,7 @@ gcm_import_LDADD =                                  \
        -lm
 
 gcm_import_CFLAGS =                                    \
-       $(WARNINGFLAGS_C)
+       $(WARN_CFLAGS)
 
 gcm_viewer_SOURCES =                                   \
        gcm-cell-renderer-profile-text.c                \
@@ -137,7 +137,7 @@ gcm_viewer_LDADD =                                  \
        -lm
 
 gcm_viewer_CFLAGS =                                    \
-       $(WARNINGFLAGS_C)
+       $(WARN_CFLAGS)
 
 gcm_picker_SOURCES =                                   \
        gcm-picker-resources.c                          \
@@ -158,7 +158,7 @@ gcm_picker_LDADD =                                  \
        -lm
 
 gcm_picker_CFLAGS =                                    \
-       $(WARNINGFLAGS_C)
+       $(WARN_CFLAGS)
 
 if HAVE_TESTS
 
@@ -189,7 +189,7 @@ gcm_self_test_LDADD =                                       \
        $(CANBERRA_LIBS)                                \
        -lm
 
-gcm_self_test_CFLAGS = $(AM_CFLAGS) $(WARNINGFLAGS_C)
+gcm_self_test_CFLAGS = $(AM_CFLAGS) $(WARN_CFLAGS)
 
 TESTS = gcm-self-test
 
diff --git a/src/gcm-calibrate-argyll.c b/src/gcm-calibrate-argyll.c
index df6b59c..67773f8 100644
--- a/src/gcm-calibrate-argyll.c
+++ b/src/gcm-calibrate-argyll.c
@@ -198,7 +198,7 @@ gcm_calibrate_argyll_get_display (const gchar *output_name,
                g_strdelimit (name, " ", '\0');
                if (g_strcmp0 (output_name, &name[26]) == 0) {
                        display = atoi (&name[4]);
-                       g_debug ("found %s mapped to %i", output_name, display);
+                       g_debug ("found %s mapped to %u", output_name, display);
                }
        }
 
@@ -378,8 +378,8 @@ gcm_calibrate_argyll_display_neutralise (GcmCalibrateArgyll *calibrate_argyll,
        g_ptr_array_add (array, g_strdup (gcm_calibrate_argyll_get_quality_arg (calibrate_argyll)));
        g_ptr_array_add (array, g_strdup ("-m"));
        if (target_whitepoint > 0)
-               g_ptr_array_add (array, g_strdup_printf ("-t%i", target_whitepoint));
-       g_ptr_array_add (array, g_strdup_printf ("-d%i", display));
+               g_ptr_array_add (array, g_strdup_printf ("-t%u", target_whitepoint));
+       g_ptr_array_add (array, g_strdup_printf ("-d%u", display));
        g_ptr_array_add (array, g_strdup_printf ("-y%c", kind));
        if (sensor_kind == CD_SENSOR_KIND_COLOR_MUNKI_PHOTO) {
                g_ptr_array_add (array, g_strdup ("-H"));
@@ -551,7 +551,7 @@ gcm_calibrate_argyll_display_draw_and_measure (GcmCalibrateArgyll *calibrate_arg
        g_ptr_array_add (array, g_strdup (command));
 #endif
        g_ptr_array_add (array, g_strdup ("-v"));
-       g_ptr_array_add (array, g_strdup_printf ("-d%i", display));
+       g_ptr_array_add (array, g_strdup_printf ("-d%u", display));
        g_ptr_array_add (array, g_strdup_printf ("-y%c", kind));
        g_ptr_array_add (array, g_strdup ("-k"));
        g_ptr_array_add (array, g_strdup_printf ("%s.cal", basename));
diff --git a/src/gcm-calibrate-main.c b/src/gcm-calibrate-main.c
index c75d7db..677eb10 100644
--- a/src/gcm-calibrate-main.c
+++ b/src/gcm-calibrate-main.c
@@ -295,7 +295,7 @@ gcm_calib_set_extra_metadata (GcmCalibratePriv *priv,
        /* add the calibration brightness if an internal panel */
        percentage = gcm_calibrate_get_screen_brightness (priv->calibrate);
        if (percentage > 0) {
-               screen_brightness_str = g_strdup_printf ("%i", percentage);
+               screen_brightness_str = g_strdup_printf ("%u", percentage);
                _cmsDictAddEntryAscii (dict,
                                       CD_PROFILE_METADATA_SCREEN_BRIGHTNESS,
                                       screen_brightness_str);
@@ -1630,8 +1630,8 @@ gcm_calib_setup_page_precision (GcmCalibratePriv *priv)
                        g_string_append (labels[i], " ");
                        /* TRANSLATORS: radio options for calibration precision */
                        g_string_append_printf (labels[i], ngettext (
-                                               "(about %i sheet of paper)",
-                                               "(about %i sheets of paper)",
+                                               "(about %u sheet of paper)",
+                                               "(about %u sheets of paper)",
                                                values_printer[i]),
                                                values_printer[i]);
                }
@@ -1641,8 +1641,8 @@ gcm_calib_setup_page_precision (GcmCalibratePriv *priv)
                        g_string_append (labels[i], " ");
                        /* TRANSLATORS: radio options for calibration precision */
                        g_string_append_printf (labels[i], ngettext (
-                                               "(about %i minute)",
-                                               "(about %i minutes)",
+                                               "(about %u minute)",
+                                               "(about %u minutes)",
                                                values_display[i]),
                                                values_display[i]);
                }
@@ -1991,7 +1991,7 @@ gcm_calib_startup_cb (GApplication *application, GcmCalibratePriv *priv)
 
        /* set the parent window if it is specified */
        if (priv->xid != 0) {
-               g_debug ("Setting xid %i", priv->xid);
+               g_debug ("Setting xid %u", priv->xid);
                gcm_window_set_parent_xid (GTK_WINDOW (priv->main_window), priv->xid);
        }
 
diff --git a/src/gcm-inspect.c b/src/gcm-inspect.c
index aad63b2..66d9336 100644
--- a/src/gcm-inspect.c
+++ b/src/gcm-inspect.c
@@ -186,7 +186,7 @@ gcm_inspect_show_x11_atoms (void)
                error = NULL;
        } else {
                /* TRANSLATORS: the root window of all the screens */
-               g_print ("%s %i.%i\n", _("Root window protocol version:"), major, minor);
+               g_print ("%s %u.%u\n", _("Root window protocol version:"), major, minor);
        }
        return ret;
 }
@@ -241,7 +241,7 @@ gcm_inspect_show_profiles_for_file (const gchar *filename)
 
        /* for each entry in the array */
        while (g_variant_iter_loop (iter, "(ss)", &filename, &description))
-               g_print ("%i.\t%s\n\t%s\n", ++i, description, filename);
+               g_print ("%u.\t%s\n\t%s\n", ++i, description, filename);
 
        /* success */
        ret = TRUE;
@@ -303,7 +303,7 @@ gcm_inspect_show_profile_for_window (guint xid)
        }
 
        /* TRANSLATORS: this is a list of profiles suitable for the device */
-       g_print ("%s %i\n", _("Suitable profiles for:"), xid);
+       g_print ("%s %u\n", _("Suitable profiles for:"), xid);
        g_print ("1.\t%s\n\t%s\n", "this is a title", profile);
 
        /* success */
diff --git a/src/gcm-picker.c b/src/gcm-picker.c
index c4e2ced..bbd05c0 100644
--- a/src/gcm-picker.c
+++ b/src/gcm-picker.c
@@ -398,7 +398,7 @@ gcm_window_set_parent_xid (GtkWindow *window, guint32 _xid)
 static void
 gcm_picker_error_cb (cmsContext ContextID, cmsUInt32Number errorcode, const char *text)
 {
-       g_warning ("LCMS error %i: %s", errorcode, text);
+       g_warning ("LCMS error %u: %s", errorcode, text);
 }
 
 static void
@@ -633,7 +633,7 @@ gcm_picker_startup_cb (GApplication *application, GcmPickerPrivate *priv)
 
        /* set the parent window if it is specified */
        if (priv->xid != 0) {
-               g_debug ("Setting xid %i", priv->xid);
+               g_debug ("Setting xid %u", priv->xid);
                gcm_window_set_parent_xid (GTK_WINDOW (main_window), priv->xid);
        }
 
diff --git a/src/gcm-print.c b/src/gcm-print.c
index 3208a1d..ecaacf0 100644
--- a/src/gcm-print.c
+++ b/src/gcm-print.c
@@ -95,7 +95,7 @@ gcm_print_begin_print_cb (GtkPrintOperation *operation, GtkPrintContext *context
        }
 
        /* setting the page count */
-       g_debug ("setting %i pages", task->filenames->len);
+       g_debug ("setting %u pages", task->filenames->len);
        gtk_print_operation_set_n_pages (operation, task->filenames->len);
 }
 
@@ -153,7 +153,7 @@ gcm_print_status_changed_cb (GtkPrintOperation *operation, GcmPrintTask *task)
 
        /* signal the status change */
        status = gtk_print_operation_get_status (operation);
-       g_debug ("emit: status-changed: %i", status);
+       g_debug ("emit: status-changed: %u", status);
        g_signal_emit (task->print, signals[SIGNAL_STATUS_CHANGED], 0, status);
 
        /* done? */
diff --git a/src/gcm-viewer.c b/src/gcm-viewer.c
index 5f23a8d..c31c3cd 100644
--- a/src/gcm-viewer.c
+++ b/src/gcm-viewer.c
@@ -112,7 +112,7 @@ gcm_viewer_set_example_image (GcmViewerPrivate *viewer, GtkImage *image)
        g_autoptr(GdkPixbuf) pixbuf = NULL;
        g_autoptr(GError) error = NULL;
 
-       filename = g_strdup_printf ("viewer-example-%02i.png", viewer->example_index);
+       filename = g_strdup_printf ("viewer-example-%02u.png", viewer->example_index);
        path = g_build_filename (GCM_DATA, "figures", filename, NULL);
        pixbuf = gdk_pixbuf_new_from_file (path, &error);
        if (pixbuf == NULL) {
@@ -1033,11 +1033,11 @@ gcm_viewer_set_profile (GcmViewerPrivate *viewer, CdProfile *profile)
        gtk_widget_set_visible (widget, temperature > 0);
        if (temperature > 0) {
                if (fabs (temperature - 5000) < 10) {
-                       temp = g_strdup_printf ("%iK (D50)", temperature);
+                       temp = g_strdup_printf ("%uK (D50)", temperature);
                } else if (fabs (temperature - 6500) < 10) {
-                       temp = g_strdup_printf ("%iK (D65)", temperature);
+                       temp = g_strdup_printf ("%uK (D65)", temperature);
                } else {
-                       temp = g_strdup_printf ("%iK", temperature);
+                       temp = g_strdup_printf ("%uK", temperature);
                }
                gtk_label_set_label (GTK_LABEL (widget), temp);
                g_free (temp);
@@ -1565,7 +1565,7 @@ gcm_viewer_startup_cb (GApplication *application, GcmViewerPrivate *viewer)
 
        /* set the parent window if it is specified */
        if (viewer->xid != 0) {
-               g_debug ("Setting xid %i", viewer->xid);
+               g_debug ("Setting xid %u", viewer->xid);
                gcm_window_set_parent_xid (GTK_WINDOW (main_window), viewer->xid);
        }
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]