* GLib at ftp://ftp.gtk.org/pub/gtk/.
*/
+#include "config.h"
+
#include "glib.h"
+#include "galias.h"
+
static GError*
-g_error_new_valist(GQuark domain,
- gint code,
- const gchar *format,
- va_list args)
+g_error_new_valist (GQuark domain,
+ gint code,
+ const gchar *format,
+ va_list args)
{
GError *error;
* @message: error message
*
* Creates a new #GError; unlike g_error_new(), @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.
+ * a printf()-style format string. Use this
+ * function if @message contains text you don't have control over,
+ * that could include printf() escape sequences.
*
* Return value: a new #GError
**/
* @domain: an error domain
* @code: an error code
*
- * Returns TRUE if @error matches @domain and @code, FALSE
+ * Returns %TRUE if @error matches @domain and @code, %FALSE
* otherwise.
*
* Return value: whether @error has @domain and @code
}
#define ERROR_OVERWRITTEN_WARNING "GError set over the top of a previous GError or uninitialized memory.\n" \
- "This indicates a bug in someone's code. You must ensure an error is NULL before it's set."
+ "This indicates a bug in someone's code. You must ensure an error is NULL before it's set.\n" \
+ "The overwriting error message was: %s"
/**
* g_set_error:
- * @err: a return location for a #GError, or NULL
+ * @err: a return location for a #GError, or %NULL
* @domain: error domain
* @code: error code
* @format: printf()-style format
* @Varargs: args for @format
*
- * 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.
+ * 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.
**/
void
g_set_error (GError **err,
const gchar *format,
...)
{
+ GError *new;
+
va_list args;
if (err == NULL)
return;
-
- if (*err != NULL)
- g_warning (ERROR_OVERWRITTEN_WARNING);
va_start (args, format);
- *err = g_error_new_valist (domain, code, format, args);
+ new = g_error_new_valist (domain, code, format, args);
va_end (args);
+
+ if (*err == NULL)
+ *err = new;
+ else
+ g_warning (ERROR_OVERWRITTEN_WARNING, new->message);
}
/**
* @dest: error return location
* @src: error to move into the return location
*
- * If @dest is NULL, free @src; otherwise,
- * moves @src into *@dest. *@dest must be NULL.
+ * If @dest is %NULL, free @src; otherwise,
+ * moves @src into *@dest. *@dest must be %NULL.
**/
void
g_propagate_error (GError **dest,
else
{
if (*dest != NULL)
- g_warning (ERROR_OVERWRITTEN_WARNING);
-
- *dest = src;
+ g_warning (ERROR_OVERWRITTEN_WARNING, src->message);
+ else
+ *dest = src;
}
}
* g_clear_error:
* @err: a #GError return location
*
- * If @err is NULL, does nothing. If @err is non-NULL,
- * calls g_error_free() on *@err and sets *@err to NULL.
+ * If @err is %NULL, does nothing. If @err is non-%NULL,
+ * calls g_error_free() on *@err and sets *@err to %NULL.
**/
void
g_clear_error (GError **err)
*err = NULL;
}
}
+
+#define __G_ERROR_C__
+#include "galiasdef.c"