Fix warnings, merge, and check my code in

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

diff --git a/src/Encoders/functionencoding.c b/src/Encoders/functionencoding.c
index 282912d2d09e6df861fbea1e5468921babcfd589..d0f8c3dc09984560ab3ecad6d63943e654b54e3e 100644 (file)
--- a/src/Encoders/functionencoding.c
+++ b/src/Encoders/functionencoding.c
@@ -1,19 +1,19 @@
 #include "functionencoding.h"
 
 FunctionEncoding * allocFunctionEncoding(FunctionEncodingType type, Element *function) {
 #include "functionencoding.h"
 
 FunctionEncoding * allocFunctionEncoding(FunctionEncodingType type, Element *function) {

-       FunctionEncoding * This=(FunctionEncoding *)ourmalloc(sizeof(FunctionEncoding));
+       FunctionEncoding * This=ourmalloc(sizeof(FunctionEncoding));

        This->op.function=function;
        This->type=type;
        return This;
 }
 
 FunctionEncoding * allocPredicateEncoding(FunctionEncodingType type, Boolean *predicate) {
        This->op.function=function;
        This->type=type;
        return This;
 }
 
 FunctionEncoding * allocPredicateEncoding(FunctionEncodingType type, Boolean *predicate) {

-       FunctionEncoding * This=(FunctionEncoding *)ourmalloc(sizeof(FunctionEncoding));
+       FunctionEncoding * This=ourmalloc(sizeof(FunctionEncoding));

        This->op.predicate=predicate;
        This->type=type;
        return This;
 }
 
        This->op.predicate=predicate;
        This->type=type;
        return This;
 }
 

-void deleteFunctionEncoding(FunctionEncoding *This) {
-       ourfree(This);
+void deleteFunctionEncoding(FunctionEncoding *fe) {
+       ourfree(fe);

 }
 }