make dbMalloc and dbCalloc macros

src/db/dbCa.c

@@ -36,9 +36,10 @@
 #include "cadef.h"
 #include "epicsAssert.h"
 #include "epicsExit.h"
+#include "cantProceed.h"
 
 /* We can't include dbStaticLib.h here */
-epicsShareFunc void * epicsShareAPI dbCalloc(size_t nobj,size_t size);
+#define dbCalloc(nobj,size) callocMustSucceed(nobj,size,"dbCalloc")
 
 #define epicsExportSharedSymbols
 #include "db_access_routines.h"

src/dbStatic/dbStaticLib.c

@@ -512,20 +512,6 @@ dbDeviceMenu *dbGetDeviceMenu(DBENTRY *pdbentry)
 }
 
 /* Beginning of Public Routines */
-void * epicsShareAPI dbCalloc(size_t nobj,size_t size)
-{
-    void *p;
-
-    p=callocMustSucceed(nobj,size,"dbCalloc");
-    return(p);
-}
-void * epicsShareAPI dbMalloc(size_t size)
-{
-    void *p;
-
-    p=mallocMustSucceed(size,"dbMalloc");
-    return(p);
-}
 
 #define INC_SIZE	256
 void epicsShareAPI dbCatString(char **string,int *stringLength,char *new,char *separator)

src/dbStatic/dbStaticLib.h

@@ -23,6 +23,7 @@
 #include "dbBase.h"
 #include "link.h"
 #include "errMdef.h"
+#include "cantProceed.h"
 
 #ifdef __cplusplus
 extern "C" {
@@ -240,8 +241,8 @@ epicsShareFunc void epicsShareAPI dbReportDeviceConfig(DBBASE *pdbbase,
     FILE *report);
 
 /* Misc useful routines*/
-epicsShareFunc void * epicsShareAPI dbCalloc(size_t nobj, size_t size);
-epicsShareFunc void * epicsShareAPI dbMalloc(size_t size);
+#define dbCalloc(nobj,size) callocMustSucceed(nobj,size,"dbCalloc")
+#define dbMalloc(size) mallocMustSucceed(size,"dbMalloc")
 epicsShareFunc void epicsShareAPI dbCatString(char **string, int *stringLength,
     char *pnew, char *separator);