Commit 9c50d657 authored by Christian Persch's avatar Christian Persch

Add g_set_error_literal. Bug #535947.

svn path=/trunk/; revision=7050
parent cc8adfae
2008-06-16 Christian Persch <chpe@gnome.org>
* docs/reference/glib/glib-sections.txt:
* glib/gerror.c:
* glib/gerror.h:
* glib/glib.symbols: Add g_set_error_literal. Bug #535947.
2008-06-16 Michael Natterer <mitch@imendio.com>
* glib/goption.c (dgettext_swapped): changed return value to
......
......@@ -386,6 +386,7 @@ g_error_free
g_error_copy
g_error_matches
g_set_error
g_set_error_literal
g_propagate_error
g_clear_error
g_prefix_error
......
......@@ -211,6 +211,37 @@ g_set_error (GError **err,
g_warning (ERROR_OVERWRITTEN_WARNING, new->message);
}
/**
* g_set_error_literal:
* @err: a return location for a #GError, or %NULL
* @domain: error domain
* @code: error code
* @message: error message
*
* Does nothing if @err is %NULL; if @err is non-%NULL, then *@err must
* be %NULL. A new #GError is created and assigned to *@err.
* Unlike g_set_error(), @message is not a printf()-style format string.
* Use this function if @message contains text you don't have control over,
* that could include printf() escape sequences.
**/
void
g_set_error_literal (GError **err,
GQuark domain,
gint code,
const gchar *message)
{
GError *new;
if (err == NULL)
return;
new = g_error_new_literal (domain, code, message);
if (*err == NULL)
*err = new;
else
g_warning (ERROR_OVERWRITTEN_WARNING, new->message);
}
/**
* g_propagate_error:
* @dest: error return location
......
......@@ -63,6 +63,11 @@ void g_set_error (GError **err,
const gchar *format,
...) G_GNUC_PRINTF (4, 5);
void g_set_error_literal (GError **err,
GQuark domain,
gint code,
const gchar *message);
/* if (dest) *dest = src; also has some sanity checks.
*/
void g_propagate_error (GError **dest,
......
......@@ -336,6 +336,7 @@ g_error_new G_GNUC_PRINTF(3,4)
g_error_new_literal
g_propagate_error
g_set_error G_GNUC_PRINTF(4,5)
g_set_error_literal
g_prefix_error G_GNUC_PRINTF(2,3)
g_propagate_prefixed_error G_GNUC_PRINTF(3,4)
#endif
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment