Revert "use parseStringAttributeEzXmlAndRememberPointer to avoid memory leaks"

arun3688 · arun3688 · commit 4a440181d011 · 2025-01-04T12:20:37.000+01:00
This reverts commit 8beb8a3.
diff --git a/fmi4c/src/fmi4c.c b/fmi4c/src/fmi4c.c
@@ -1545,7 +1545,7 @@ bool parseModelDescriptionFmi3(fmiHandle *fmu)
 
             var.causality = fmi3CausalityLocal;
             const char* causality = NULL;
-            if(parseStringAttributeEzXmlAndRememberPointer(varElement, "causality", &causality, fmu)) {
+            if(parseStringAttributeEzXml(varElement, "causality", &causality)) {
                 if(!strcmp(causality, "parameter")) {
                     var.causality = fmi3CausalityParameter;
                 }
@@ -1586,7 +1586,7 @@ bool parseModelDescriptionFmi3(fmiHandle *fmu)
             else {
                 var.variability = fmi3VariabilityDiscrete;
             }
-            if(parseStringAttributeEzXmlAndRememberPointer(varElement, "variability", &variability, fmu)) {
+            if(parseStringAttributeEzXml(varElement, "variability", &variability)) {
                 if(variability && !strcmp(variability, "constant")) {
                     var.variability = fmi3VariabilityConstant;
                 }
@@ -1626,7 +1626,7 @@ bool parseModelDescriptionFmi3(fmiHandle *fmu)
                 var.datatype == fmi3DataTypeEnumeration){
                 var.initial = fmi3InitialUnknown;
                 const char *initial = NULL;
-                if (parseStringAttributeEzXmlAndRememberPointer(varElement, "initial", &initial, fmu))
+                if (parseStringAttributeEzXml(varElement, "initial", &initial))
                 {
                     if (initial && !strcmp(initial, "approx"))
                     {

Original file line number	Diff line number	Diff line change
`@@ -1545,7 +1545,7 @@ bool parseModelDescriptionFmi3(fmiHandle *fmu)`
`1545`	`1545`
`1546`	`1546`	`var.causality = fmi3CausalityLocal;`
`1547`	`1547`	`const char* causality = NULL;`
`1548`		`- if(parseStringAttributeEzXmlAndRememberPointer(varElement, "causality", &causality, fmu)) {`
	`1548`	`+ if(parseStringAttributeEzXml(varElement, "causality", &causality)) {`
`1549`	`1549`	`if(!strcmp(causality, "parameter")) {`
`1550`	`1550`	`var.causality = fmi3CausalityParameter;`
`1551`	`1551`	`}`
`@@ -1586,7 +1586,7 @@ bool parseModelDescriptionFmi3(fmiHandle *fmu)`
`1586`	`1586`	`else {`
`1587`	`1587`	`var.variability = fmi3VariabilityDiscrete;`
`1588`	`1588`	`}`
`1589`		`- if(parseStringAttributeEzXmlAndRememberPointer(varElement, "variability", &variability, fmu)) {`
	`1589`	`+ if(parseStringAttributeEzXml(varElement, "variability", &variability)) {`
`1590`	`1590`	`if(variability && !strcmp(variability, "constant")) {`
`1591`	`1591`	`var.variability = fmi3VariabilityConstant;`
`1592`	`1592`	`}`
`@@ -1626,7 +1626,7 @@ bool parseModelDescriptionFmi3(fmiHandle *fmu)`
`1626`	`1626`	`var.datatype == fmi3DataTypeEnumeration){`
`1627`	`1627`	`var.initial = fmi3InitialUnknown;`
`1628`	`1628`	`const char *initial = NULL;`
`1629`		`- if (parseStringAttributeEzXmlAndRememberPointer(varElement, "initial", &initial, fmu))`
	`1629`	`+ if (parseStringAttributeEzXml(varElement, "initial", &initial))`
`1630`	`1630`	`{`
`1631`	`1631`	`if (initial && !strcmp(initial, "approx"))`
`1632`	`1632`	`{`