X-Git-Url: http://git.asbjorn.biz/?a=blobdiff_plain;f=lib%2Fpython%2Fpyutils.c;h=a89b2872817041a0cba0af6282442a89064d6b6d;hb=8af316a3e9acb50d020455f30d72af127b1cf21d;hp=389193eb123f37c5373731db0a895f2825ad1714;hpb=a18cdd835cad27c679d6a9659836f035fc3a0b5c;p=swftools.git diff --git a/lib/python/pyutils.c b/lib/python/pyutils.c index 389193e..a89b287 100644 --- a/lib/python/pyutils.c +++ b/lib/python/pyutils.c @@ -20,7 +20,7 @@ char* setError(char*format, ...) return strdup(buf); } -int verbose = 1; +static int verbose = 0; void mylog(char*format, ...) { char buf[1024]; @@ -70,8 +70,16 @@ PyMethodDef* addMethods(PyMethodDef*obj1, PyMethodDef*obj2) if(obj1) for(num1=0;obj1[num1].ml_name;num1++); if(obj2) for(num2=0;obj2[num2].ml_name;num2++); PyMethodDef* result = malloc(sizeof(PyMethodDef)*(num1+num2+1)); - memcpy(result, obj1, num1*sizeof(PyMethodDef)); - memcpy(&result[num1], obj2, (num2+1)*sizeof(PyMethodDef)); - //free(obj1)? + if(obj1) + memcpy(result, obj1, num1*sizeof(PyMethodDef)); + if(obj2) + memcpy(&result[num1], obj2, (num2+1)*sizeof(PyMethodDef)); + if(obj1) + free(obj1); return result; } +void setVerbosity(int _verbose) +{ + verbose = _verbose; + mylog("setting verbosity to %d", verbose); +}