luc14n0/glib
1
0
Fork 0
mirror of https://gitlab.gnome.org/GNOME/glib.git synced 2025-02-09 20:35:49 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fix gcc warnings

Browse Source 
svn path=/trunk/; revision=7585
This commit is contained in:
Matthias Clasen 2008-10-10 04:54:51 +00:00
parent 65ac7d4034
commit 6310f898b8
9 changed files with 44 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
ChangeLog
View File

@ -1,3 +1,12 @@
2008-10-10 Matthias Clasen <mclasen@redhat.com>
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 <mclasen@redhat.com> 2008-10-10 Matthias Clasen <mclasen@redhat.com>
Bug 552861 – glib-2.0.m4 calls system(3) without storing its result Bug 552861 – glib-2.0.m4 calls system(3) without storing its result

6
gio/ChangeLog
View File

@ -1,3 +1,9 @@
2008-10-10 Matthias Clasen <mclasen@redhat.com>
* gio/glocalfileinfo.c:
* gio/tests/live-g-file.c:
* gio/gsimpleasyncresult.c: Fix gcc warnings.
2008-10-09 Alexander Larsson <alexl@redhat.com> 2008-10-09 Alexander Larsson <alexl@redhat.com>
* gunixinputstream.c (g_unix_input_stream_read): * gunixinputstream.c (g_unix_input_stream_read):

12
gio/glocalfileinfo.c
View File

@ -1792,8 +1792,8 @@ get_string (const GFileAttributeValue *value,
{ {
if (value->type != G_FILE_ATTRIBUTE_TYPE_STRING) if (value->type != G_FILE_ATTRIBUTE_TYPE_STRING)
{ {
g_set_error (error, G_IO_ERROR, G_IO_ERROR_INVALID_ARGUMENT, g_set_error_literal (error, G_IO_ERROR, G_IO_ERROR_INVALID_ARGUMENT,
_("Invalid attribute type (byte string expected)")); _("Invalid attribute type (byte string expected)"));
return FALSE; return FALSE;
} }
@ -2059,8 +2059,8 @@ set_selinux_context (char *filename,
if (val == NULL) if (val == NULL)
{ {
g_set_error (error, G_IO_ERROR, G_IO_ERROR_INVALID_ARGUMENT, g_set_error_literal (error, G_IO_ERROR, G_IO_ERROR_INVALID_ARGUMENT,
_("SELinux context must be non-NULL")); _("SELinux context must be non-NULL"));
return FALSE; return FALSE;
} }
@ -2082,8 +2082,8 @@ set_selinux_context (char *filename,
} }
g_free (val_s); g_free (val_s);
} else { } else {
g_set_error (error, G_IO_ERROR, G_IO_ERROR_INVALID_ARGUMENT, g_set_error_literal (error, G_IO_ERROR, G_IO_ERROR_INVALID_ARGUMENT,
_("SELinux is not enabled on this system")); _("SELinux is not enabled on this system"));
return FALSE; return FALSE;
} }
#endif #endif

1
gio/gsimpleasyncresult.c
View File

@ -609,6 +609,7 @@ run_in_thread (GIOSchedulerJob *job,
g_simple_async_result_set_error (simple, g_simple_async_result_set_error (simple,
G_IO_ERROR, G_IO_ERROR,
G_IO_ERROR_CANCELLED, G_IO_ERROR_CANCELLED,
"%s",
_("Operation was cancelled")); _("Operation was cancelled"));
else else
data->func (simple, data->func (simple,

2
gio/tests/live-g-file.c
View File

@ -1136,7 +1136,7 @@ main (int argc, char *argv[])
if (! target_path) if (! target_path)
{ {
g_print ("error: target path was not specified\n"); 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 (); return g_test_run ();
} }

19
glib/gmarkup.c
View File

@ -1050,6 +1050,7 @@ g_markup_parse_context_parse (GMarkupParseContext *context,
set_error (context, set_error (context,
error, error,
G_MARKUP_ERROR_BAD_UTF8, G_MARKUP_ERROR_BAD_UTF8,
"%s",
_("Invalid UTF-8 encoded text - overlong sequence")); _("Invalid UTF-8 encoded text - overlong sequence"));
} }
@ -1078,6 +1079,7 @@ g_markup_parse_context_parse (GMarkupParseContext *context,
set_error (context, set_error (context,
error, error,
G_MARKUP_ERROR_BAD_UTF8, G_MARKUP_ERROR_BAD_UTF8,
"%s",
_("Invalid UTF-8 encoded text - not a start char")); _("Invalid UTF-8 encoded text - not a start char"));
goto finished; goto finished;
} }
@ -1155,6 +1157,7 @@ g_markup_parse_context_parse (GMarkupParseContext *context,
set_error (context, set_error (context,
error, error,
G_MARKUP_ERROR_PARSE, G_MARKUP_ERROR_PARSE,
"%s",
_("Document must begin with an element (e.g. <book>)")); _("Document must begin with an element (e.g. <book>)"));
} }
} }
@ -1844,7 +1847,7 @@ g_markup_parse_context_end_parse (GMarkupParseContext *context,
if (context->document_empty) 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")); _("Document was empty or contained only whitespace"));
return FALSE; return FALSE;
} }
@ -1858,7 +1861,7 @@ g_markup_parse_context_end_parse (GMarkupParseContext *context,
break; break;
case STATE_AFTER_OPEN_ANGLE: 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 '<'")); _("Document ended unexpectedly just after an open angle bracket '<'"));
break; break;
@ -1880,31 +1883,31 @@ g_markup_parse_context_end_parse (GMarkupParseContext *context,
break; break;
case STATE_INSIDE_OPEN_TAG_NAME: 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")); _("Document ended unexpectedly inside an element name"));
break; break;
case STATE_INSIDE_ATTRIBUTE_NAME: case STATE_INSIDE_ATTRIBUTE_NAME:
case STATE_AFTER_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")); _("Document ended unexpectedly inside an attribute name"));
break; break;
case STATE_BETWEEN_ATTRIBUTES: 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 " _("Document ended unexpectedly inside an element-opening "
"tag.")); "tag."));
break; break;
case STATE_AFTER_ATTRIBUTE_EQUALS_SIGN: 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 " _("Document ended unexpectedly after the equals sign "
"following an attribute name; no attribute value")); "following an attribute name; no attribute value"));
break; break;
case STATE_INSIDE_ATTRIBUTE_VALUE_SQ: case STATE_INSIDE_ATTRIBUTE_VALUE_SQ:
case STATE_INSIDE_ATTRIBUTE_VALUE_DQ: 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 " _("Document ended unexpectedly while inside an attribute "
"value")); "value"));
break; break;
@ -1926,7 +1929,7 @@ g_markup_parse_context_end_parse (GMarkupParseContext *context,
break; break;
case STATE_INSIDE_PASSTHROUGH: 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 " _("Document ended unexpectedly inside a comment or "
"processing instruction")); "processing instruction"));
break; break;

6
glib/gregex.c
View File

@ -365,7 +365,7 @@ translate_compile_error (gint *errcode, const gchar **errmsg)
case 45: case 45:
/* These errors should not happen as we are using an UTF8-enabled PCRE /* These errors should not happen as we are using an UTF8-enabled PCRE
* and we do not check if strings are valid */ * and we do not check if strings are valid */
g_warning (*errmsg); g_warning ("%s", *errmsg);
*errcode = G_REGEX_ERROR_COMPILE; *errcode = G_REGEX_ERROR_COMPILE;
break; break;
default: default:
@ -1096,7 +1096,7 @@ g_regex_new (const gchar *pattern,
if (!support) if (!support)
{ {
msg = N_("PCRE library is compiled without UTF8 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)); g_set_error_literal (error, G_REGEX_ERROR, G_REGEX_ERROR_COMPILE, gettext (msg));
return NULL; return NULL;
} }
@ -1105,7 +1105,7 @@ g_regex_new (const gchar *pattern,
if (!support) if (!support)
{ {
msg = N_("PCRE library is compiled without UTF8 properties 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)); g_set_error_literal (error, G_REGEX_ERROR, G_REGEX_ERROR_COMPILE, gettext (msg));
return NULL; return NULL;
} }

2
glib/grel.c
View File

@ -436,7 +436,7 @@ g_relation_print_one (gpointer tuple_key,
} }
g_string_append (gstring, "]"); 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); g_string_free (gstring, TRUE);
} }

12
glib/gshell.c
View File

@ -65,9 +65,9 @@ unquote_string_inplace (gchar* str, gchar** end, GError** err)
if (!(*s == '"' || *s == '\'')) if (!(*s == '"' || *s == '\''))
{ {
if (err) if (err)
*err = g_error_new(G_SHELL_ERROR, *err = g_error_new_literal (G_SHELL_ERROR,
G_SHELL_ERROR_BAD_QUOTING, G_SHELL_ERROR_BAD_QUOTING,
_("Quoted text doesn't begin with a quotation mark")); _("Quoted text doesn't begin with a quotation mark"));
*end = str; *end = str;
return FALSE; return FALSE;
} }
@ -155,9 +155,9 @@ unquote_string_inplace (gchar* str, gchar** end, GError** err)
*dest = '\0'; *dest = '\0';
if (err) if (err)
*err = g_error_new(G_SHELL_ERROR, *err = g_error_new_literal (G_SHELL_ERROR,
G_SHELL_ERROR_BAD_QUOTING, G_SHELL_ERROR_BAD_QUOTING,
_("Unmatched quotation mark in command line or other shell-quoted text")); _("Unmatched quotation mark in command line or other shell-quoted text"));
*end = s; *end = s;
return FALSE; return FALSE;
} }