epicsRingBytes avoid cantProceed

This commit is contained in:
Michael Davidsaver
2011-08-26 16:33:57 -07:00
committed by Michael Davidsaver
parent 333ac3a88e
commit 294e66039e
+4 -4
View File
@@ -19,7 +19,6 @@
#define epicsExportSharedSymbols
#include "dbDefs.h"
#include "cantProceed.h"
#include "epicsRingBytes.h"
/*
@@ -39,9 +38,11 @@ typedef struct ringPvt {
epicsShareFunc epicsRingBytesId epicsShareAPI epicsRingBytesCreate(int size)
{
ringPvt *pring = mallocMustSucceed(sizeof(ringPvt),"epicsRingBytesCreate");
ringPvt *pring = malloc(sizeof(ringPvt) + size + SLOP);
if(!pring)
return NULL;
pring->size = size + SLOP;
pring->buffer = mallocMustSucceed(pring->size,"ringCreate");
pring->buffer = (char*)&pring[1];
pring->nextGet = 0;
pring->nextPut = 0;
return((void *)pring);
@@ -50,7 +51,6 @@ epicsShareFunc epicsRingBytesId epicsShareAPI epicsRingBytesCreate(int size)
epicsShareFunc void epicsShareAPI epicsRingBytesDelete(epicsRingBytesId id)
{
ringPvt *pring = (ringPvt *)id;
free((void *)pring->buffer);
free((void *)pring);
}