From 21f84ec16aebbb22152bcc8fe2fb9cf5a4eb76b5 Mon Sep 17 00:00:00 2001 From: Matthew Fernandez Date: Fri, 23 Dec 2022 13:27:01 -0800 Subject: [PATCH] graphml2gv: remove unnecessary dynamic allocation of user data --- cmd/tools/graphml2gv.c | 25 +++++++++++-------------- 1 file changed, 11 insertions(+), 14 deletions(-) diff --git a/cmd/tools/graphml2gv.c b/cmd/tools/graphml2gv.c index 90f265561..822df2806 100644 --- a/cmd/tools/graphml2gv.c +++ b/cmd/tools/graphml2gv.c @@ -99,20 +99,17 @@ static Agedge_t *E; /* Set if Current_class == TAG_EDGE */ static gv_stack_t Gstack; -static userdata_t *genUserdata(char* dfltname) -{ - userdata_t *user = gv_alloc(sizeof(*user)); - user->elements = (gv_stack_t){0}; - user->closedElementType = TAG_NONE; - user->edgeinverted = FALSE; - user->gname = dfltname; - return user; +static userdata_t genUserdata(char *dfltname) { + userdata_t user = {0}; + user.elements = (gv_stack_t){0}; + user.closedElementType = TAG_NONE; + user.edgeinverted = FALSE; + user.gname = dfltname; + return user; } -static void freeUserdata(userdata_t * ud) -{ - freeString(&ud->elements); - free(ud); +static void freeUserdata(userdata_t ud) { + freeString(&ud.elements); } static int isAnonGraph(const char *name) { @@ -361,11 +358,11 @@ static Agraph_t *graphml_to_gv(char* gname, FILE * graphmlFile, int* rv) { char buf[BUFSIZ]; int done; - userdata_t *udata = genUserdata(gname); + userdata_t udata = genUserdata(gname); XML_Parser parser = XML_ParserCreate(NULL); *rv = 0; - XML_SetUserData(parser, udata); + XML_SetUserData(parser, &udata); XML_SetElementHandler(parser, startElementHandler, endElementHandler); Current_class = TAG_GRAPH; -- 2.50.1