luc14n0/glib
1
0
Fork 0
mirror of https://gitlab.gnome.org/GNOME/glib.git synced 2025-01-12 15:36:17 +01:00
Code Issues Packages Projects Releases Wiki Activity

make this a "const gpointer" rather than a gconstpointer to avoid warnings

Browse Source 
* glib/gthreadpool.c (wakeup_thread_marker): make this a "const
	gpointer" rather than a gconstpointer to avoid warnings later

	* glib/pcre/pcre_ucp_searchfuncs.c:
	* glib/pcre/pcre_valid_utf8.c: #include "config.h"

	* glib/tests/printf.c (test_d): fool gcc into not warning about
	some printf format strings that we know are dubious

svn path=/trunk/; revision=7552
This commit is contained in:
Dan Winship 2008-09-26 16:00:45 +00:00
parent 7afe2bb07a
commit ea0970e9ca
5 changed files with 33 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
ChangeLog
View File

@ -1,3 +1,14 @@
2008-09-26 Dan Winship <danw@gnome.org>
* glib/gthreadpool.c (wakeup_thread_marker): make this a "const
gpointer" rather than a gconstpointer to avoid warnings later
* glib/pcre/pcre_ucp_searchfuncs.c:
* glib/pcre/pcre_valid_utf8.c: #include "config.h"
* glib/tests/printf.c (test_d): fool gcc into not warning about
some printf format strings that we know are dubious
2008-09-26 Matthias Clasen <mclasen@redhat.com>
Bug 553857 – gbacktrace.h requires signal.h

2
glib/gthreadpool.c
View File

@ -51,7 +51,7 @@ struct _GRealThreadPool
/* The following is just an address to mark the wakeup order for a
* thread, it could be any address (as long, as it isn't a valid
* GThreadPool address) */
static gconstpointer const wakeup_thread_marker = (gconstpointer) &g_thread_pool_new;
static const gpointer wakeup_thread_marker = (gpointer) &g_thread_pool_new;
static gint wakeup_thread_serial = 0;
/* Here all unused threads are waiting */

4
glib/pcre/pcre_ucp_searchfuncs.c
View File

@ -43,6 +43,10 @@ POSSIBILITY OF SUCH DAMAGE.
/* This module contains code for searching the table of Unicode character
properties. */
#ifdef HAVE_CONFIG_H
#include "config.h"
#endif
#include "pcre_internal.h"
#include "ucp.h" /* Category definitions */

1
glib/pcre/pcre_valid_utf8.c
View File

@ -1,3 +1,4 @@
#include "config.h"
#include "pcre_internal.h"
/*

24
glib/tests/printf.c
View File

@ -69,6 +69,7 @@ test_d (void)
{
gchar buf[128];
gint res;
const gchar *fmt;
/* %d basic formatting */
@ -172,21 +173,28 @@ test_d (void)
g_assert_cmpint (res, ==, 1);
g_assert_cmpstr (buf, ==, " ");
res = g_snprintf (buf, 128, "% +d", 5);
g_assert_cmpint (res, ==, 2);
g_assert_cmpstr (buf, ==, "+5");
res = g_snprintf (buf, 128, "%03d", 5);
g_assert_cmpint (res, ==, 3);
g_assert_cmpstr (buf, ==, "005");
res = g_snprintf (buf, 128, "%-03d", -5);
g_assert_cmpint (res, ==, 3);
g_assert_cmpstr (buf, ==, "-5 ");
res = g_snprintf (buf, 128, "%03d", -5);
g_assert_cmpint (res, ==, 3);
g_assert_cmpstr (buf, ==, "-05");
/* gcc emits warnings for the following formats, since the C spec
* says some of the flags must be ignored. (The " " in "% +d" and
* the "0" in "%-03d".) But we need to test that our printf gets
* those rules right. So we fool gcc into not warning.
*/
fmt = "% +d";
res = g_snprintf (buf, 128, fmt, 5);
g_assert_cmpint (res, ==, 2);
g_assert_cmpstr (buf, ==, "+5");
fmt = "%-03d";
res = g_snprintf (buf, 128, fmt, -5);
g_assert_cmpint (res, ==, 3);
g_assert_cmpstr (buf, ==, "-5 ");
}
static void