r31408 - in /desktop/experimental/glib2.0/debian: changelog patches/97-silence-compiler-warnings.patch patches/series

sjoerd at users.alioth.debian.org sjoerd at users.alioth.debian.org
Tue Nov 15 21:11:15 UTC 2011


Author: sjoerd
Date: Tue Nov 15 21:11:14 2011
New Revision: 31408

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=31408
Log:
* debian/patches/97-silence-compiler-warnings.patch:
  - Added, Fix various compiler warnings

Added:
    desktop/experimental/glib2.0/debian/patches/97-silence-compiler-warnings.patch
Modified:
    desktop/experimental/glib2.0/debian/changelog
    desktop/experimental/glib2.0/debian/patches/series

Modified: desktop/experimental/glib2.0/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/glib2.0/debian/changelog?rev=31408&op=diff
==============================================================================
--- desktop/experimental/glib2.0/debian/changelog [utf-8] (original)
+++ desktop/experimental/glib2.0/debian/changelog [utf-8] Tue Nov 15 21:11:14 2011
@@ -10,8 +10,10 @@
   * debian/patches/96-fix-one-bit-mutex-test-on-some-platforms.patch:
     - Added, Fix the 1 bit mutex failing on platforms that have pointers
       aligned to 32 bits instead of 64 bits (bgo#201322).
-
- -- Sjoerd Simons <sjoerd at debian.org>  Mon, 14 Nov 2011 08:07:31 +0100
+  * debian/patches/97-silence-compiler-warnings.patch:
+    - Added, Fix various compiler warnings
+
+ -- Sjoerd Simons <sjoerd at debian.org>  Tue, 15 Nov 2011 22:04:08 +0100
 
 glib2.0 (2.30.2-1) experimental; urgency=low
 

Added: desktop/experimental/glib2.0/debian/patches/97-silence-compiler-warnings.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/glib2.0/debian/patches/97-silence-compiler-warnings.patch?rev=31408&op=file
==============================================================================
--- desktop/experimental/glib2.0/debian/patches/97-silence-compiler-warnings.patch (added)
+++ desktop/experimental/glib2.0/debian/patches/97-silence-compiler-warnings.patch [utf-8] Tue Nov 15 21:11:14 2011
@@ -1,0 +1,66 @@
+From 7951edd4174dfb144415c4cda309f70de4db01dd Mon Sep 17 00:00:00 2001
+From: Sjoerd Simons <sjoerd.simons at collabora.co.uk>
+Date: Mon, 14 Nov 2011 22:06:07 +0100
+Subject: [PATCH] Silence compiler warnings
+
+Fix several warnings for format strings (-Werror=format-security) and
+set but unused variables (-Wunused-but-set-variable)
+---
+ tests/iochannel-test.c |   10 ++++------
+ 1 files changed, 4 insertions(+), 6 deletions(-)
+
+diff --git a/tests/iochannel-test.c b/tests/iochannel-test.c
+index f08688b..4a67aac 100644
+--- a/tests/iochannel-test.c
++++ b/tests/iochannel-test.c
+@@ -64,7 +64,6 @@ gint main (gint argc, gchar * argv[])
+     gsize length_out;
+     const gchar encoding[] = "EUC-JP";
+     GIOStatus status;
+-    GIOFlags flags;
+ 
+     if (!srcdir)
+       srcdir = ".";
+@@ -90,7 +89,7 @@ gint main (gint argc, gchar * argv[])
+     g_io_channel_set_encoding (gio_r, encoding, &gerr);
+     if (gerr)
+       {
+-        g_warning (gerr->message);
++        g_warning ("%s", gerr->message);
+         /* Keep going if this is just a case of iconv not supporting EUC-JP, see bug 428048 */
+         if (gerr->code != G_CONVERT_ERROR_NO_CONVERSION)
+           return 1;
+@@ -103,11 +102,10 @@ gint main (gint argc, gchar * argv[])
+     status = g_io_channel_set_flags (gio_r, G_IO_FLAG_NONBLOCK, &gerr);
+     if (status == G_IO_STATUS_ERROR)
+       {
+-        g_warning (gerr->message);
++        g_warning ("%s", gerr->message);
+         g_error_free (gerr);
+         gerr = NULL;
+       }
+-    flags = g_io_channel_get_flags (gio_r);
+     buffer = g_string_sized_new (BUFFER_SIZE);
+ 
+     while (TRUE)
+@@ -143,7 +141,7 @@ gint main (gint argc, gchar * argv[])
+         case G_IO_STATUS_EOF:
+           break;
+         case G_IO_STATUS_ERROR:
+-          g_warning (gerr->message);
++          g_warning ("%s", gerr->message);
+           g_error_free (gerr);
+           gerr = NULL;
+           break;
+@@ -158,7 +156,7 @@ gint main (gint argc, gchar * argv[])
+ 
+     if (status == G_IO_STATUS_ERROR)
+       {
+-        g_warning (gerr->message);
++        g_warning ("%s", gerr->message);
+         g_error_free (gerr);
+         gerr = NULL;
+       }
+-- 
+1.7.7.2
+

Modified: desktop/experimental/glib2.0/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/glib2.0/debian/patches/series?rev=31408&op=diff
==============================================================================
--- desktop/experimental/glib2.0/debian/patches/series [utf-8] (original)
+++ desktop/experimental/glib2.0/debian/patches/series [utf-8] Tue Nov 15 21:11:14 2011
@@ -6,3 +6,4 @@
 90-gio-modules-multiarch-compat.patch
 95-gmain-get-rid-of-poll_waiting.patch
 96-fix-one-bit-mutex-test-on-some-platforms.patch
+97-silence-compiler-warnings.patch




More information about the pkg-gnome-commits mailing list