summaryrefslogtreecommitdiff
path: root/glib/gshell.c
diff options
context:
space:
mode:
authorChristian Persch <chpe@src.gnome.org>2008-10-13 12:43:37 +0000
committerChristian Persch <chpe@src.gnome.org>2008-10-13 12:43:37 +0000
commit630f89fb1af3b24134304d25d9111c42abee6fde (patch)
tree4eb1f1e052fe3b6d6b83d79880befab1557554b0 /glib/gshell.c
parent6eb38fb4db7a0802774bbd31c66d16bd369ced52 (diff)
downloadglib-630f89fb1af3b24134304d25d9111c42abee6fde.tar.gz
Bug 555311 – format not a string literal and no format arguments
svn path=/trunk/; revision=7597
Diffstat (limited to 'glib/gshell.c')
-rw-r--r--glib/gshell.c16
1 files changed, 8 insertions, 8 deletions
diff --git a/glib/gshell.c b/glib/gshell.c
index c68364fa2..711cdee09 100644
--- a/glib/gshell.c
+++ b/glib/gshell.c
@@ -64,10 +64,10 @@ unquote_string_inplace (gchar* str, gchar** end, GError** err)
if (!(*s == '"' || *s == '\''))
{
- if (err)
- *err = g_error_new_literal (G_SHELL_ERROR,
- G_SHELL_ERROR_BAD_QUOTING,
- _("Quoted text doesn't begin with a quotation mark"));
+ g_set_error_literal (err,
+ G_SHELL_ERROR,
+ G_SHELL_ERROR_BAD_QUOTING,
+ _("Quoted text doesn't begin with a quotation mark"));
*end = str;
return FALSE;
}
@@ -154,10 +154,10 @@ unquote_string_inplace (gchar* str, gchar** end, GError** err)
*dest = '\0';
- if (err)
- *err = g_error_new_literal (G_SHELL_ERROR,
- G_SHELL_ERROR_BAD_QUOTING,
- _("Unmatched quotation mark in command line or other shell-quoted text"));
+ g_set_error_literal (err,
+ G_SHELL_ERROR,
+ G_SHELL_ERROR_BAD_QUOTING,
+ _("Unmatched quotation mark in command line or other shell-quoted text"));
*end = s;
return FALSE;
}