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

* 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

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