fixed some small bugs M.Z.
This commit is contained in:
1
conman.c
1
conman.c
@ -460,6 +460,7 @@ extern pServer pServ;
|
||||
{
|
||||
DeleteCommandStack(pVictim->pStack);
|
||||
}
|
||||
pVictim->lMagic=0; /* make a write to a freed conn. harmless */
|
||||
/* finally free pVictim*/
|
||||
free(pVictim);
|
||||
}
|
||||
|
@ -484,12 +484,11 @@
|
||||
int iRet;
|
||||
assert(self);
|
||||
|
||||
self->iRun = 0;
|
||||
|
||||
/* do nothing if not running */
|
||||
if(self->lTask < 0)
|
||||
{
|
||||
printf("Nothing to wait for.... \n");
|
||||
self->iRun = 0; /* not sure if this is needed here, but does not harm */
|
||||
return self->iStatus;
|
||||
}
|
||||
|
||||
|
@ -736,7 +736,6 @@ static void ErrReport(pEVControl self)
|
||||
ObParInit(pRes->pParam, SETTLE, "settle", 0., usUser);
|
||||
|
||||
/* local initialisations */
|
||||
pRes->pDriv = pDriv;
|
||||
if (pDriv->GetValues==NULL) /* if GetValues is undefined, set to default */
|
||||
{
|
||||
pDriv->GetValues=StdGetValues;
|
||||
@ -765,7 +764,7 @@ static void ErrReport(pEVControl self)
|
||||
DeleteEVController(pRes);
|
||||
return NULL;
|
||||
}
|
||||
|
||||
pRes->pDriv = pDriv; /* moved here to avoid double freeing on evfactory del */
|
||||
return pRes;
|
||||
}
|
||||
/*---------------------------------------------------------------------------*/
|
||||
|
Reference in New Issue
Block a user