[librsvg: 5/10] rsvg_load_steal_result(): Renamed from rsvg_handle_steal_tree()



commit d01e247af3fc4c7b75572d6c8c8fd2595348aead
Author: Federico Mena Quintero <federico gnome org>
Date:   Thu Nov 22 09:39:04 2018 -0600

    rsvg_load_steal_result(): Renamed from rsvg_handle_steal_tree()
    
    We will soon return more things than just the tree.

 librsvg/rsvg-handle.c | 2 +-
 librsvg/rsvg-load.c   | 7 ++++---
 librsvg/rsvg-load.h   | 3 ++-
 3 files changed, 7 insertions(+), 5 deletions(-)
---
diff --git a/librsvg/rsvg-handle.c b/librsvg/rsvg-handle.c
index 7b9b7e47..4ba6ad48 100644
--- a/librsvg/rsvg-handle.c
+++ b/librsvg/rsvg-handle.c
@@ -685,7 +685,7 @@ finish_load (RsvgHandle *handle, gboolean was_successful, GError **error)
     if (was_successful) {
         g_assert (error == NULL || *error == NULL);
 
-        tree = rsvg_load_steal_tree (handle->priv->load);
+        rsvg_load_steal_result (handle->priv->load, &tree);
         was_successful = tree_is_valid (tree, error);
         if (!was_successful) {
             g_clear_pointer (&tree, rsvg_tree_free);
diff --git a/librsvg/rsvg-load.c b/librsvg/rsvg-load.c
index 2a5c8975..da58fb23 100644
--- a/librsvg/rsvg-load.c
+++ b/librsvg/rsvg-load.c
@@ -141,10 +141,11 @@ rsvg_load_free (RsvgLoad *load)
     g_free (load);
 }
 
-RsvgTree *
-rsvg_load_steal_tree (RsvgLoad *load)
+void
+rsvg_load_steal_result (RsvgLoad *load,
+                        RsvgTree **out_tree)
 {
-    return rsvg_xml_state_steal_tree (load->xml.rust_state);
+    *out_tree = rsvg_xml_state_steal_tree (load->xml.rust_state);
 }
 
 static void
diff --git a/librsvg/rsvg-load.h b/librsvg/rsvg-load.h
index 6cfcace9..647b3e58 100644
--- a/librsvg/rsvg-load.h
+++ b/librsvg/rsvg-load.h
@@ -35,7 +35,8 @@ G_GNUC_INTERNAL
 gboolean rsvg_load_handle_xml_xinclude (RsvgHandle *handle, const char *url);
 
 G_GNUC_INTERNAL
-RsvgTree *rsvg_load_steal_tree (RsvgLoad *load) G_GNUC_WARN_UNUSED_RESULT;
+void rsvg_load_steal_result (RsvgLoad *load,
+                             RsvgTree **out_tree);
 
 G_GNUC_INTERNAL
 gboolean rsvg_load_write (RsvgLoad *load, const guchar *buf, gsize count, GError **error) 
G_GNUC_WARN_UNUSED_RESULT;


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]