- Cosmetic changes to sicsget and counter
- Fixed a bug when NETconnect would come back with errno EINPROGRESS which is no error really
This commit is contained in:
@ -265,7 +265,7 @@ static int CheckCountStatus(void *pData, SConnection * pCon)
|
||||
int eCt;
|
||||
char pError[80], pBueffel[132];
|
||||
int iErr;
|
||||
float fControl, rate;
|
||||
float fControl = .0, rate;
|
||||
MonEvent sMon;
|
||||
|
||||
self = (pCounter) pData;
|
||||
|
@ -287,9 +287,9 @@ mkChannel *NETConnectWithFlags(char *name, int port, int flags)
|
||||
|
||||
iRet = connect(pRes->sockid, (struct sockaddr *) &(pRes->adresse),
|
||||
sizeof(struct sockaddr_in));
|
||||
if (iRet < 0) {
|
||||
close(pRes->sockid);
|
||||
if (iRet < 0 && errno ) {
|
||||
if (errno != EINPROGRESS) {
|
||||
close(pRes->sockid);
|
||||
free(pRes);
|
||||
return NULL;
|
||||
}
|
||||
|
@ -280,8 +280,12 @@ static void configureSICSPipe()
|
||||
static int FindTclVar(void *ms, void *userData)
|
||||
{
|
||||
pParseMessage self = (pParseMessage)ms;
|
||||
char *pPtr = NULL;
|
||||
|
||||
self->response = Tcl_GetVar(InterpGetTcl(pServ->pSics),self->command, TCL_GLOBAL_ONLY);
|
||||
pPtr = Tcl_GetVar(InterpGetTcl(pServ->pSics),self->command, TCL_GLOBAL_ONLY);
|
||||
if(pPtr != NULL){
|
||||
self->response = strdup(pPtr);
|
||||
}
|
||||
if(self->response == NULL){
|
||||
return MPSTOP;
|
||||
}
|
||||
|
Reference in New Issue
Block a user