isa/mutter
1
0
Fork 0
mirror of https://github.com/brl/mutter.git synced 2024-11-09 23:46:33 -05:00
Code Issues Packages Projects Releases Wiki Activity

error: Don't allocate a new CoglError when propagating

Browse Source 
The _cogl_propagate_error() function takes ownership of the incoming
error pointer so there's no need to allocate a new error when passing
it on. The errors can potentially be passed up from a number of layers
so it seems worthwhile to avoid the allocation.

The _cogl_propagate_gerror() function was previously using
_cogl_propagate_error(). Presumably this would not have worked because
that function would try to free the error from glib using
cogl_error_free but that would use the wrong free function and thus
the wrong slice allocator. The GError propagating function is only
used when gdk-pixbuf is enabled which now requires glib support anyway
so we can just avoid defining the function when compiling without
glib.

Reviewed-by: Robert Bragg <robert@linux.intel.com>

(cherry picked from commit 91266162bef9f89fb42c01be0f929d5079758096)
This commit is contained in:
Neil Roberts 2012-11-22 17:07:15 +00:00 committed by Robert Bragg
parent af0dc3431d
commit ca5197a70c
2 changed files with 16 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
cogl/cogl-error-private.h
View File

@ -43,9 +43,11 @@ void
_cogl_propagate_error (CoglError **dest, _cogl_propagate_error (CoglError **dest,
CoglError *src); CoglError *src);
#ifdef COGL_HAS_GLIB_SUPPORT
void void
_cogl_propagate_gerror (CoglError **dest, _cogl_propagate_gerror (CoglError **dest,
GError *src); GError *src);
#endif /* COGL_HAS_GLIB_SUPPORT */
#define _cogl_clear_error(X) g_clear_error ((GError **)X) #define _cogl_clear_error(X) g_clear_error ((GError **)X)

13
cogl/cogl-error.c
View File

@ -104,13 +104,24 @@ _cogl_propagate_error (CoglError **dest,
{ {
_COGL_RETURN_IF_FAIL (src != NULL); _COGL_RETURN_IF_FAIL (src != NULL);
_cogl_set_error_literal (dest, src->domain, src->code, src->message); if (dest == NULL)
cogl_error_free (src); cogl_error_free (src);
else if (*dest)
g_warning (ERROR_OVERWRITTEN_WARNING, src->message);
else
*dest = src;
} }
/* This function is only used from the gdk-pixbuf image backend so it
* should only be called if we are using the system GLib. It would be
* difficult to get this to work without the system glib because we
* would need to somehow call the same g_error_free function that
* gdk-pixbuf is using */
#ifdef COGL_HAS_GLIB_SUPPORT
void void
_cogl_propagate_gerror (CoglError **dest, _cogl_propagate_gerror (CoglError **dest,
GError *src) GError *src)
{ {
_cogl_propagate_error (dest, (CoglError *) src); _cogl_propagate_error (dest, (CoglError *) src);
} }
#endif /* COGL_HAS_GLIB_SUPPORT */