[librsvg/rustification] Inline a one-liner function that was only used in a single place



commit 35a73818a15a826f073bca41aa5c54bef296e1f4
Author: Federico Mena Quintero <federico gnome org>
Date:   Wed Nov 9 12:19:08 2016 -0600

    Inline a one-liner function that was only used in a single place

 rsvg-base.c      |    5 +++--
 rsvg-structure.c |    7 -------
 rsvg-structure.h |    2 --
 3 files changed, 3 insertions(+), 11 deletions(-)
---
diff --git a/rsvg-base.c b/rsvg-base.c
index d0a6783..ece77cc 100644
--- a/rsvg-base.c
+++ b/rsvg-base.c
@@ -722,8 +722,9 @@ rsvg_end_element (void *data, const xmlChar * name)
         }
 
         if (ctx->priv->currentnode &&
-            !strcmp ((const char *) name, ctx->priv->currentnode->name))
-                rsvg_pop_def_group (ctx);
+            !strcmp ((const char *) name, ctx->priv->currentnode->name)) {
+            ctx->priv->currentnode = ctx->priv->currentnode->parent;
+        }
 
         /* FIXMEchpe: shouldn't this check that currentnode == treebase or sth like that? */
         if (ctx->priv->treebase && !strcmp ((const char *)name, "svg"))
diff --git a/rsvg-structure.c b/rsvg-structure.c
index 569aba7..7ac8318 100644
--- a/rsvg-structure.c
+++ b/rsvg-structure.c
@@ -146,13 +146,6 @@ rsvg_new_group (void)
 }
 
 void
-rsvg_pop_def_group (RsvgHandle * ctx)
-{
-    g_assert (ctx->priv->currentnode != NULL);
-    ctx->priv->currentnode = ctx->priv->currentnode->parent;
-}
-
-void
 rsvg_node_group_pack (RsvgNode * self, RsvgNode * child)
 {
     g_ptr_array_add (self->children, child);
diff --git a/rsvg-structure.h b/rsvg-structure.h
index 601a273..3cecc2b 100644
--- a/rsvg-structure.h
+++ b/rsvg-structure.h
@@ -80,8 +80,6 @@ struct _RsvgNodeSvg {
 };
 
 G_GNUC_INTERNAL
-void rsvg_pop_def_group     (RsvgHandle * ctx);
-G_GNUC_INTERNAL
 void rsvg_node_group_pack   (RsvgNode * self, RsvgNode * child);
 G_GNUC_INTERNAL
 void rsvg_node_draw         (RsvgNode * self, RsvgDrawingCtx * ctx, int dominate);


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