Merge patches from branch
r2406 | dcl | 2008-03-27 13:22:19 +1100 (Thu, 27 Mar 2008) | 2 lines
This commit is contained in:
@@ -230,7 +230,7 @@ int SICSPollWrapper(SConnection *pCon,SicsInterp *pSics, void *pData,
|
|||||||
}
|
}
|
||||||
|
|
||||||
driv = makePollDriver(pCon,argv[3], argv[2],
|
driv = makePollDriver(pCon,argv[3], argv[2],
|
||||||
argc-3, &argv[4]);
|
argc-4, &argv[4]);
|
||||||
if(driv != NULL){
|
if(driv != NULL){
|
||||||
LLDnodeAppend(self->pollList,&driv);
|
LLDnodeAppend(self->pollList,&driv);
|
||||||
SCSendOK(pCon);
|
SCSendOK(pCon);
|
||||||
|
|||||||
@@ -46,6 +46,10 @@ void killSicsPoll(void *data){
|
|||||||
status = LLDnodePtr2Next(self->pollList);
|
status = LLDnodePtr2Next(self->pollList);
|
||||||
}
|
}
|
||||||
LLDdelete(self->pollList);
|
LLDdelete(self->pollList);
|
||||||
|
if (self->pDes) {
|
||||||
|
DeleteDescriptor(self->pDes);
|
||||||
|
self->pDes = NULL;
|
||||||
|
}
|
||||||
free(self);
|
free(self);
|
||||||
if(defCon != NULL){
|
if(defCon != NULL){
|
||||||
SCDeleteConnection(defCon);
|
SCDeleteConnection(defCon);
|
||||||
@@ -203,7 +207,7 @@ static void printPollList(pSicsPoll self, SConnection *pCon){
|
|||||||
<%testNoPar 4 9%>
|
<%testNoPar 4 9%>
|
||||||
<%testPriv usMugger 9%>
|
<%testPriv usMugger 9%>
|
||||||
driv = makePollDriver(pCon,argv[3], argv[2],
|
driv = makePollDriver(pCon,argv[3], argv[2],
|
||||||
argc-3, &argv[4]);
|
argc-4, &argv[4]);
|
||||||
if(driv != NULL){
|
if(driv != NULL){
|
||||||
LLDnodeAppend(self->pollList,&driv);
|
LLDnodeAppend(self->pollList,&driv);
|
||||||
SCSendOK(pCon);
|
SCSendOK(pCon);
|
||||||
|
|||||||
Reference in New Issue
Block a user