From: Matthias Clasen Date: Fri, 10 Oct 2008 04:54:51 +0000 (+0000) Subject: Fix gcc warnings X-Git-Tag: GLIB_2_19_0~16 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=6310f898b89637ac729a3f2c35c93bdf801c9d94;p=platform%2Fupstream%2Fglib.git Fix gcc warnings svn path=/trunk/; revision=7585 --- diff --git a/ChangeLog b/ChangeLog index 23f4973..7d97074 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,14 @@ 2008-10-10 Matthias Clasen + Bug 554557 – Patch to fix gcc warnings about missing format + specifiers + + * glib/gmarkup.c: + * glib/gshell.c: + * glib/grel.c: Fix gcc warnings. Patch by Kjartan Maraas + +2008-10-10 Matthias Clasen + Bug 552861 – glib-2.0.m4 calls system(3) without storing its result * m4macros/glib-2.0.m4: Cosmetic change to make -Werror happy. diff --git a/gio/ChangeLog b/gio/ChangeLog index 213cc92..a3e07e4 100644 --- a/gio/ChangeLog +++ b/gio/ChangeLog @@ -1,3 +1,9 @@ +2008-10-10 Matthias Clasen + + * gio/glocalfileinfo.c: + * gio/tests/live-g-file.c: + * gio/gsimpleasyncresult.c: Fix gcc warnings. + 2008-10-09 Alexander Larsson * gunixinputstream.c (g_unix_input_stream_read): diff --git a/gio/glocalfileinfo.c b/gio/glocalfileinfo.c index 2bb684b..85cb2f1 100644 --- a/gio/glocalfileinfo.c +++ b/gio/glocalfileinfo.c @@ -1792,8 +1792,8 @@ get_string (const GFileAttributeValue *value, { if (value->type != G_FILE_ATTRIBUTE_TYPE_STRING) { - g_set_error (error, G_IO_ERROR, G_IO_ERROR_INVALID_ARGUMENT, - _("Invalid attribute type (byte string expected)")); + g_set_error_literal (error, G_IO_ERROR, G_IO_ERROR_INVALID_ARGUMENT, + _("Invalid attribute type (byte string expected)")); return FALSE; } @@ -2059,8 +2059,8 @@ set_selinux_context (char *filename, if (val == NULL) { - g_set_error (error, G_IO_ERROR, G_IO_ERROR_INVALID_ARGUMENT, - _("SELinux context must be non-NULL")); + g_set_error_literal (error, G_IO_ERROR, G_IO_ERROR_INVALID_ARGUMENT, + _("SELinux context must be non-NULL")); return FALSE; } @@ -2082,8 +2082,8 @@ set_selinux_context (char *filename, } g_free (val_s); } else { - g_set_error (error, G_IO_ERROR, G_IO_ERROR_INVALID_ARGUMENT, - _("SELinux is not enabled on this system")); + g_set_error_literal (error, G_IO_ERROR, G_IO_ERROR_INVALID_ARGUMENT, + _("SELinux is not enabled on this system")); return FALSE; } #endif diff --git a/gio/gsimpleasyncresult.c b/gio/gsimpleasyncresult.c index 5ec3a27..d4cc05e 100644 --- a/gio/gsimpleasyncresult.c +++ b/gio/gsimpleasyncresult.c @@ -609,6 +609,7 @@ run_in_thread (GIOSchedulerJob *job, g_simple_async_result_set_error (simple, G_IO_ERROR, G_IO_ERROR_CANCELLED, + "%s", _("Operation was cancelled")); else data->func (simple, diff --git a/gio/tests/live-g-file.c b/gio/tests/live-g-file.c index 08e4d12..d0d4e8a 100644 --- a/gio/tests/live-g-file.c +++ b/gio/tests/live-g-file.c @@ -1136,7 +1136,7 @@ main (int argc, char *argv[]) if (! target_path) { g_print ("error: target path was not specified\n"); - g_print (g_option_context_get_help (context, TRUE, NULL)); + g_print ("%s", g_option_context_get_help (context, TRUE, NULL)); return g_test_run (); } diff --git a/glib/gmarkup.c b/glib/gmarkup.c index 43f5b26..4c1ed39 100644 --- a/glib/gmarkup.c +++ b/glib/gmarkup.c @@ -1050,6 +1050,7 @@ g_markup_parse_context_parse (GMarkupParseContext *context, set_error (context, error, G_MARKUP_ERROR_BAD_UTF8, + "%s", _("Invalid UTF-8 encoded text - overlong sequence")); } @@ -1078,6 +1079,7 @@ g_markup_parse_context_parse (GMarkupParseContext *context, set_error (context, error, G_MARKUP_ERROR_BAD_UTF8, + "%s", _("Invalid UTF-8 encoded text - not a start char")); goto finished; } @@ -1155,6 +1157,7 @@ g_markup_parse_context_parse (GMarkupParseContext *context, set_error (context, error, G_MARKUP_ERROR_PARSE, + "%s", _("Document must begin with an element (e.g. )")); } } @@ -1844,7 +1847,7 @@ g_markup_parse_context_end_parse (GMarkupParseContext *context, if (context->document_empty) { - set_error (context, error, G_MARKUP_ERROR_EMPTY, + set_error (context, error, G_MARKUP_ERROR_EMPTY, "%s", _("Document was empty or contained only whitespace")); return FALSE; } @@ -1858,7 +1861,7 @@ g_markup_parse_context_end_parse (GMarkupParseContext *context, break; case STATE_AFTER_OPEN_ANGLE: - set_error (context, error, G_MARKUP_ERROR_PARSE, + set_error (context, error, G_MARKUP_ERROR_PARSE, "%s", _("Document ended unexpectedly just after an open angle bracket '<'")); break; @@ -1880,31 +1883,31 @@ g_markup_parse_context_end_parse (GMarkupParseContext *context, break; case STATE_INSIDE_OPEN_TAG_NAME: - set_error (context, error, G_MARKUP_ERROR_PARSE, + set_error (context, error, G_MARKUP_ERROR_PARSE, "%s", _("Document ended unexpectedly inside an element name")); break; case STATE_INSIDE_ATTRIBUTE_NAME: case STATE_AFTER_ATTRIBUTE_NAME: - set_error (context, error, G_MARKUP_ERROR_PARSE, + set_error (context, error, G_MARKUP_ERROR_PARSE, "%s", _("Document ended unexpectedly inside an attribute name")); break; case STATE_BETWEEN_ATTRIBUTES: - set_error (context, error, G_MARKUP_ERROR_PARSE, + set_error (context, error, G_MARKUP_ERROR_PARSE, "%s", _("Document ended unexpectedly inside an element-opening " "tag.")); break; case STATE_AFTER_ATTRIBUTE_EQUALS_SIGN: - set_error (context, error, G_MARKUP_ERROR_PARSE, + set_error (context, error, G_MARKUP_ERROR_PARSE, "%s", _("Document ended unexpectedly after the equals sign " "following an attribute name; no attribute value")); break; case STATE_INSIDE_ATTRIBUTE_VALUE_SQ: case STATE_INSIDE_ATTRIBUTE_VALUE_DQ: - set_error (context, error, G_MARKUP_ERROR_PARSE, + set_error (context, error, G_MARKUP_ERROR_PARSE, "%s", _("Document ended unexpectedly while inside an attribute " "value")); break; @@ -1926,7 +1929,7 @@ g_markup_parse_context_end_parse (GMarkupParseContext *context, break; case STATE_INSIDE_PASSTHROUGH: - set_error (context, error, G_MARKUP_ERROR_PARSE, + set_error (context, error, G_MARKUP_ERROR_PARSE, "%s", _("Document ended unexpectedly inside a comment or " "processing instruction")); break; diff --git a/glib/gregex.c b/glib/gregex.c index f4a1cbe..ef9ac05 100644 --- a/glib/gregex.c +++ b/glib/gregex.c @@ -365,7 +365,7 @@ translate_compile_error (gint *errcode, const gchar **errmsg) case 45: /* These errors should not happen as we are using an UTF8-enabled PCRE * and we do not check if strings are valid */ - g_warning (*errmsg); + g_warning ("%s", *errmsg); *errcode = G_REGEX_ERROR_COMPILE; break; default: @@ -1096,7 +1096,7 @@ g_regex_new (const gchar *pattern, if (!support) { msg = N_("PCRE library is compiled without UTF8 support"); - g_critical (msg); + g_critical ("%s", msg); g_set_error_literal (error, G_REGEX_ERROR, G_REGEX_ERROR_COMPILE, gettext (msg)); return NULL; } @@ -1105,7 +1105,7 @@ g_regex_new (const gchar *pattern, if (!support) { msg = N_("PCRE library is compiled without UTF8 properties support"); - g_critical (msg); + g_critical ("%s", msg); g_set_error_literal (error, G_REGEX_ERROR, G_REGEX_ERROR_COMPILE, gettext (msg)); return NULL; } diff --git a/glib/grel.c b/glib/grel.c index 61c54e4..b6ee651 100644 --- a/glib/grel.c +++ b/glib/grel.c @@ -436,7 +436,7 @@ g_relation_print_one (gpointer tuple_key, } g_string_append (gstring, "]"); - g_log (G_LOG_DOMAIN, G_LOG_LEVEL_INFO, gstring->str); + g_log (G_LOG_DOMAIN, G_LOG_LEVEL_INFO, "%s", gstring->str); g_string_free (gstring, TRUE); } diff --git a/glib/gshell.c b/glib/gshell.c index 2ad21db..c68364f 100644 --- a/glib/gshell.c +++ b/glib/gshell.c @@ -65,9 +65,9 @@ unquote_string_inplace (gchar* str, gchar** end, GError** err) if (!(*s == '"' || *s == '\'')) { if (err) - *err = g_error_new(G_SHELL_ERROR, - G_SHELL_ERROR_BAD_QUOTING, - _("Quoted text doesn't begin with a quotation mark")); + *err = g_error_new_literal (G_SHELL_ERROR, + G_SHELL_ERROR_BAD_QUOTING, + _("Quoted text doesn't begin with a quotation mark")); *end = str; return FALSE; } @@ -155,9 +155,9 @@ unquote_string_inplace (gchar* str, gchar** end, GError** err) *dest = '\0'; if (err) - *err = g_error_new(G_SHELL_ERROR, - G_SHELL_ERROR_BAD_QUOTING, - _("Unmatched quotation mark in command line or other shell-quoted text")); + *err = g_error_new_literal (G_SHELL_ERROR, + G_SHELL_ERROR_BAD_QUOTING, + _("Unmatched quotation mark in command line or other shell-quoted text")); *end = s; return FALSE; }