Skip to content
This repository has been archived by the owner on Nov 17, 2020. It is now read-only.

Commit

Permalink
Fix gcc warnings
Browse files Browse the repository at this point in the history 
svn path=/trunk/; revision=7585
  • Loading branch information
Matthias Clasen committed Oct 10, 2008
1 parent 65ac7d4 commit 6310f89
Show file tree
Hide file tree
Showing 9 changed files with 44 additions and 25 deletions.
9 changes: 9 additions & 0 deletions 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>

Bug 552861 – glib-2.0.m4 calls system(3) without storing its result
Expand Down
6 changes: 6 additions & 0 deletions 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>

* gunixinputstream.c (g_unix_input_stream_read):
Expand Down
12 changes: 6 additions & 6 deletions gio/glocalfileinfo.c
View file
Expand Up @@ -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;
}

Expand Down Expand Up @@ -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;
}

Expand All @@ -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
Expand Down
1 change: 1 addition & 0 deletions gio/gsimpleasyncresult.c
View file
Expand Up @@ -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,
Expand Down
2 changes: 1 addition & 1 deletion gio/tests/live-g-file.c
View file
Expand Up @@ -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 ();
}

Expand Down
19 changes: 11 additions & 8 deletions glib/gmarkup.c
View file
Expand Up @@ -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"));
}

Expand Down Expand Up @@ -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;
}
Expand Down Expand Up @@ -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. <book>)"));
}
}
Expand Down Expand Up @@ -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;
}
Expand All @@ -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;

Expand All @@ -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;
Expand All @@ -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;
Expand Down
6 changes: 3 additions & 3 deletions glib/gregex.c
View file
Expand Up @@ -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:
Expand Down Expand Up @@ -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;
}
Expand All @@ -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;
}
Expand Down
2 changes: 1 addition & 1 deletion glib/grel.c
View file
Expand Up @@ -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);
}

Expand Down
12 changes: 6 additions & 6 deletions glib/gshell.c
View file
Expand Up @@ -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;
}
Expand Down Expand Up @@ -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;
}
Expand Down

0 comments on commit 6310f89

Please sign in to comment.