epics/epics-base
0
0
Fork 0
Code Issues Pull Requests Projects Wiki Activity

libCom: actually use libComAPI.h in libCom

Browse Source
This commit is contained in:
Michael Davidsaver
2020-05-20 13:38:09 -07:00
parent b2750bbe93
commit 799e72b1e3
250 changed files with 1286 additions and 1434 deletions
Download Patch File Download Diff File Expand all files Collapse all files
modules/libcom/src/gpHash/gpHash.h
+9 -9
View File
@@ -14,7 +14,7 @@
#ifndef INC_gpHash_H
#define INC_gpHash_H
#include "shareLib.h"
#include "libComAPI.h"
#include "ellLib.h"
@@ -32,19 +32,19 @@ extern "C" {
#endif
/*tableSize must be power of 2 in range 256 to 65536*/
epicsShareFunc void epicsShareAPI
LIBCOM_API void epicsStdCall
gphInitPvt(struct gphPvt **ppvt, int tableSize);
epicsShareFunc GPHENTRY * epicsShareAPI
LIBCOM_API GPHENTRY * epicsStdCall
gphFind(struct gphPvt *pvt, const char *name, void *pvtid);
epicsShareFunc GPHENTRY * epicsShareAPI
LIBCOM_API GPHENTRY * epicsStdCall
gphFindParse(struct gphPvt *pvt, const char *name, size_t len, void *pvtid);
epicsShareFunc GPHENTRY * epicsShareAPI
LIBCOM_API GPHENTRY * epicsStdCall
gphAdd(struct gphPvt *pvt, const char *name, void *pvtid);
epicsShareFunc void epicsShareAPI
LIBCOM_API void epicsStdCall
gphDelete(struct gphPvt *pvt, const char *name, void *pvtid);
epicsShareFunc void epicsShareAPI gphFreeMem(struct gphPvt *pvt);
epicsShareFunc void epicsShareAPI gphDump(struct gphPvt *pvt);
epicsShareFunc void epicsShareAPI gphDumpFP(FILE *fp, struct gphPvt *pvt);
LIBCOM_API void epicsStdCall gphFreeMem(struct gphPvt *pvt);
LIBCOM_API void epicsStdCall gphDump(struct gphPvt *pvt);
LIBCOM_API void epicsStdCall gphDumpFP(FILE *fp, struct gphPvt *pvt);
#ifdef __cplusplus
}
modules/libcom/src/gpHash/gpHashLib.c
+8 -9
View File
@@ -13,7 +13,6 @@
#include <stdlib.h>
#include <stddef.h>
#define epicsExportSharedSymbols
#include "cantProceed.h"
#include "epicsMutex.h"
#include "epicsStdioRedirect.h"
@@ -35,7 +34,7 @@ typedef struct gphPvt {
#define MAX_SIZE 65536
void epicsShareAPI gphInitPvt(gphPvt **ppvt, int size)
void epicsStdCall gphInitPvt(gphPvt **ppvt, int size)
{
gphPvt *pgphPvt;
@@ -59,7 +58,7 @@ void epicsShareAPI gphInitPvt(gphPvt **ppvt, int size)
return;
}
GPHENTRY * epicsShareAPI gphFindParse(gphPvt *pgphPvt, const char *name, size_t len, void *pvtid)
GPHENTRY * epicsStdCall gphFindParse(gphPvt *pgphPvt, const char *name, size_t len, void *pvtid)
{
ELLLIST **paplist;
ELLLIST *gphlist;
@@ -90,12 +89,12 @@ GPHENTRY * epicsShareAPI gphFindParse(gphPvt *pgphPvt, const char *name, size_t
return pgphNode;
}
GPHENTRY * epicsShareAPI gphFind(gphPvt *pgphPvt, const char *name, void *pvtid)
GPHENTRY * epicsStdCall gphFind(gphPvt *pgphPvt, const char *name, void *pvtid)
{
return gphFindParse(pgphPvt, name, strlen(name), pvtid);
}
GPHENTRY * epicsShareAPI gphAdd(gphPvt *pgphPvt, const char *name, void *pvtid)
GPHENTRY * epicsStdCall gphAdd(gphPvt *pgphPvt, const char *name, void *pvtid)
{
ELLLIST **paplist;
ELLLIST *plist;
@@ -140,7 +139,7 @@ GPHENTRY * epicsShareAPI gphAdd(gphPvt *pgphPvt, const char *name, void *pvtid)
return (pgphNode);
}
void epicsShareAPI gphDelete(gphPvt *pgphPvt, const char *name, void *pvtid)
void epicsStdCall gphDelete(gphPvt *pgphPvt, const char *name, void *pvtid)
{
ELLLIST **paplist;
ELLLIST *plist = NULL;
@@ -174,7 +173,7 @@ void epicsShareAPI gphDelete(gphPvt *pgphPvt, const char *name, void *pvtid)
return;
}
void epicsShareAPI gphFreeMem(gphPvt *pgphPvt)
void epicsStdCall gphFreeMem(gphPvt *pgphPvt)
{
ELLLIST **paplist;
int h;
@@ -204,12 +203,12 @@ void epicsShareAPI gphFreeMem(gphPvt *pgphPvt)
free(pgphPvt);
}
void epicsShareAPI gphDump(gphPvt *pgphPvt)
void epicsStdCall gphDump(gphPvt *pgphPvt)
{
gphDumpFP(stdout, pgphPvt);
}
void epicsShareAPI gphDumpFP(FILE *fp, gphPvt *pgphPvt)
void epicsStdCall gphDumpFP(FILE *fp, gphPvt *pgphPvt)
{
unsigned int empty = 0;
ELLLIST **paplist;