- Various fixes to make mountaingum work

This commit is contained in:
koennecke
2007-08-15 07:14:50 +00:00
parent 25f80f42fb
commit 590a979290
10 changed files with 1930 additions and 9976 deletions

View File

@@ -336,6 +336,7 @@ static int SICSNotifyCallback(void *userData, void *callData, pHdb node,
SCPopContext(cbInfo->pCon);
SCsetMacro(cbInfo->pCon,macro);
free(pPath);
DeleteDynString(result);
return status;
}
}
@@ -472,7 +473,7 @@ static int SICSScriptReadCallback(void *userData, void *callData, pHdb node,
command = (char *)userData;
pCon = (SConnection *)callData;
assert(command != NULL && pCon != NULL);
assert(command != NULL);
/*
* evaluate
@@ -481,7 +482,9 @@ static int SICSScriptReadCallback(void *userData, void *callData, pHdb node,
if(status != TCL_OK){
snprintf(error,1023,"ERROR: Tcl returned error: %s",
Tcl_GetStringResult(InterpGetTcl(pServ->pSics)));
SCWrite(pCon,error,eError);
if(pCon != NULL){
SCWrite(pCon,error,eError);
}
status = 0;
} else {
status = 1;
@@ -494,7 +497,9 @@ static int SICSScriptReadCallback(void *userData, void *callData, pHdb node,
*/
data = (char *)Tcl_GetStringResult(InterpGetTcl(pServ->pSics));
if(data == NULL){
SCWrite(pCon,"ERROR: no result returned from script",eError);
if(pCon != NULL){
SCWrite(pCon,"ERROR: no result returned from script",eError);
}
return 0;
}
equal = strchr(data,'=');
@@ -504,7 +509,9 @@ static int SICSScriptReadCallback(void *userData, void *callData, pHdb node,
strcpy(error,"ERROR: ");
status = readHdbValue(&node->value,data, error+7, 1024-7);
if(status != 1){
SCWrite(pCon,error,eError);
if(pCon != NULL){
SCWrite(pCon,error,eError);
}
return 0;
}
return status;
@@ -2353,12 +2360,10 @@ static int ChainCallback(void *userData, void *callData, pHdb node,
hdbValue vv, old;
if(slave != NULL){
old = slave->value;
memset(&vv,0,sizeof(hdbValue));
GetHipadabaPar(slave,&vv,callData);
if(!compareHdbValue(old,vv)){
UpdateHipadabaPar(slave, vv, callData);
}
UpdateHipadabaPar(slave, vv, callData);
ReleaseHdbValue(&vv);
}
return 1;
}