linse/sics
0
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

- Cosmetic changes to sicsget and counter

Browse Source 
- Fixed a bug when NETconnect would come back with errno EINPROGRESS which is no
  error really
This commit is contained in:
koennecke
2014-06-06 16:38:14 +02:00
parent 98790ec9c5
commit a27f0d9b94
3 changed files with 8 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
counter.c
View File

@ -265,7 +265,7 @@ static int CheckCountStatus(void *pData, SConnection * pCon)
int eCt; int eCt;
char pError[80], pBueffel[132]; char pError[80], pBueffel[132];
int iErr; int iErr;
float fControl, rate; float fControl = .0, rate;
MonEvent sMon; MonEvent sMon;
self = (pCounter) pData; self = (pCounter) pData;

4
network.c
View File

@ -287,9 +287,9 @@ mkChannel *NETConnectWithFlags(char *name, int port, int flags)
iRet = connect(pRes->sockid, (struct sockaddr *) &(pRes->adresse), iRet = connect(pRes->sockid, (struct sockaddr *) &(pRes->adresse),
sizeof(struct sockaddr_in)); sizeof(struct sockaddr_in));
if (iRet < 0) { if (iRet < 0 && errno ) {
close(pRes->sockid);
if (errno != EINPROGRESS) { if (errno != EINPROGRESS) {
close(pRes->sockid);
free(pRes); free(pRes);
return NULL; return NULL;
} }

6
sicsget.c
View File

@ -280,8 +280,12 @@ static void configureSICSPipe()
static int FindTclVar(void *ms, void *userData) static int FindTclVar(void *ms, void *userData)
{ {
pParseMessage self = (pParseMessage)ms; 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){ if(self->response == NULL){
return MPSTOP; return MPSTOP;
} }