[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] master b315455: Use g_clear_error instead of g_error_free
From: |
Daiki Ueno |
Subject: |
[Emacs-diffs] master b315455: Use g_clear_error instead of g_error_free |
Date: |
Fri, 09 Oct 2015 01:02:15 +0000 |
branch: master
commit b3154551bc501ba46983ce2cc943100cfb803f8c
Author: Daiki Ueno <address@hidden>
Commit: Daiki Ueno <address@hidden>
Use g_clear_error instead of g_error_free
* src/image.c: Define g_clear_error instead of g_error_free.
(init_svg_functions): Resolve symbol g_clear_error instead of
g_error_free.
(svg_load_image): Use g_clear_error instead of g_error_free, to
suppress GLib warnings when ERR is not set. See bug#21641.
---
src/image.c | 10 +++++-----
1 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/src/image.c b/src/image.c
index 4d1d201..c702782 100644
--- a/src/image.c
+++ b/src/image.c
@@ -8991,7 +8991,7 @@ DEF_DLL_FN (int, gdk_pixbuf_get_bits_per_sample, (const
GdkPixbuf *));
DEF_DLL_FN (void, g_type_init, (void));
# endif
DEF_DLL_FN (void, g_object_unref, (gpointer));
-DEF_DLL_FN (void, g_error_free, (GError *));
+DEF_DLL_FN (void, g_clear_error, (GError **));
static bool
init_svg_functions (void)
@@ -9029,7 +9029,7 @@ init_svg_functions (void)
LOAD_DLL_FN (gobject, g_type_init);
# endif
LOAD_DLL_FN (gobject, g_object_unref);
- LOAD_DLL_FN (glib, g_error_free);
+ LOAD_DLL_FN (glib, g_clear_error);
return 1;
}
@@ -9045,7 +9045,7 @@ init_svg_functions (void)
# undef gdk_pixbuf_get_pixels
# undef gdk_pixbuf_get_rowstride
# undef gdk_pixbuf_get_width
-# undef g_error_free
+# undef g_clear_error
# undef g_object_unref
# undef g_type_init
# undef rsvg_handle_close
@@ -9063,7 +9063,7 @@ init_svg_functions (void)
# define gdk_pixbuf_get_pixels fn_gdk_pixbuf_get_pixels
# define gdk_pixbuf_get_rowstride fn_gdk_pixbuf_get_rowstride
# define gdk_pixbuf_get_width fn_gdk_pixbuf_get_width
-# define g_error_free fn_g_error_free
+# define g_clear_error fn_g_clear_error
# define g_object_unref fn_g_object_unref
# define g_type_init fn_g_type_init
# define rsvg_handle_close fn_rsvg_handle_close
@@ -9318,7 +9318,7 @@ svg_load_image (struct frame *f, /* Pointer to
emacs frame structure. *
/* FIXME: Use error->message so the user knows what is the actual
problem with the image. */
image_error ("Error parsing SVG image `%s'", img->spec);
- g_error_free (err);
+ g_clear_error (&err);
return 0;
}
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Emacs-diffs] master b315455: Use g_clear_error instead of g_error_free,
Daiki Ueno <=