Fix memory errors detected by valgrind and inline functions

[satune.git] / src / Encoders / elementencoding.c

diff --git a/src/Encoders/elementencoding.c b/src/Encoders/elementencoding.c
index fb2ce4aa4ea2536843c6812bd25283d309223926..217327d346ec2b753cca3d059e6638d1c1055139 100644 (file)
--- a/src/Encoders/elementencoding.c
+++ b/src/Encoders/elementencoding.c
@@ -1,13 +1,12 @@
 #include "elementencoding.h"
 
-ElementEncoding * allocElementEncoding(ElementEncodingType type, Element *element) {
-       ElementEncoding * This=(ElementEncoding *)ourmalloc(sizeof(ElementEncoding));
+void initElementEncoding(ElementEncoding * This, Element *element) {
        This->element=element;
-       This->type=type;
+       This->type=ELEM_UNASSIGNED;
        This->variables=NULL;
        This->encodingArray=NULL;
+       This->inUseArray=NULL;
        This->numVars=0;
-       return This;
 }
 
 void deleteElementEncoding(ElementEncoding *This) {
@@ -17,7 +16,6 @@ void deleteElementEncoding(ElementEncoding *This) {
                ourfree(This->encodingArray);
        if (This->inUseArray!=NULL)
                ourfree(This->inUseArray);
-       ourfree(This);
 }
 
 void allocEncodingArrayElement(ElementEncoding *This, uint size) {