[librsvg: 1/48] RsvgSaxHandlerStyle - don't use an RsvgSaxHandlerDefs struct to store the parent handler



commit f8fe8cc77b9ca3c93bd95908ea2693c5e5fe0c9d
Author: Federico Mena Quintero <federico gnome org>
Date:   Tue Aug 28 19:40:34 2018 -0500

    RsvgSaxHandlerStyle - don't use an RsvgSaxHandlerDefs struct to store the parent handler
    
    The code was using a single field in RsvgSaxHandlerDefs, anyway.

 librsvg/rsvg-load.c | 11 +++--------
 1 file changed, 3 insertions(+), 8 deletions(-)
---
diff --git a/librsvg/rsvg-load.c b/librsvg/rsvg-load.c
index 44e1f670..77f10a52 100644
--- a/librsvg/rsvg-load.c
+++ b/librsvg/rsvg-load.c
@@ -93,14 +93,9 @@ struct RsvgSaxHandler {
 static xmlSAXHandler rsvgSAXHandlerStruct;
 static gboolean rsvgSAXHandlerStructInited = FALSE;
 
-typedef struct _RsvgSaxHandlerDefs {
-    RsvgSaxHandler super;
-    RsvgHandle *handle;
-} RsvgSaxHandlerDefs;
-
 typedef struct _RsvgSaxHandlerStyle {
     RsvgSaxHandler super;
-    RsvgSaxHandlerDefs *parent;
+    RsvgSaxHandler *parent;
     RsvgLoad *load;
     GString *style;
     gboolean is_text_css;
@@ -205,7 +200,7 @@ static void
 style_handler_end (RsvgSaxHandler * self, const char *name)
 {
     RsvgSaxHandlerStyle *z = (RsvgSaxHandlerStyle *) self;
-    RsvgSaxHandler *prev = &z->parent->super;
+    RsvgSaxHandler *prev = z->parent;
 
     if (!strcmp (name, "style")) {
         if (z->load->handler != NULL) {
@@ -232,7 +227,7 @@ start_style (RsvgLoad *load, RsvgPropertyBag *atts)
 
     handler->style = g_string_new (NULL);
 
-    handler->parent = (RsvgSaxHandlerDefs *) load->handler;
+    handler->parent = load->handler;
     load->handler = &handler->super;
 
     /* FIXME: See these:


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