This commit is contained in:
Andrew Johnson
2016-04-26 22:13:12 -05:00
parent 8a5d1a08ad
commit 0348c2295b
3 changed files with 6 additions and 27 deletions

View File

@@ -13,45 +13,23 @@
*/
#include <stddef.h>
#include <stdlib.h>
#include <stdarg.h>
#include <stdio.h>
#include <string.h>
#include "alarm.h"
#include "cvtFast.h"
#include "dbDefs.h"
#include "ellLib.h"
#include "epicsTime.h"
#include "errlog.h"
#define epicsExportSharedSymbols
#include "callback.h"
#include "dbAccessDefs.h"
#include "dbAddr.h"
#include "dbBase.h"
#include "dbBkpt.h"
#include "dbCa.h"
#include "dbCommon.h"
#include "dbConvertFast.h"
#include "dbConvert.h"
#include "dbDbLink.h"
#include "dbEvent.h"
#include "db_field_log.h"
#include "dbFldTypes.h"
#include "dbFldTypes.h"
#include "dbLink.h"
#include "dbLockPvt.h"
#include "dbNotify.h"
#include "dbScan.h"
#include "dbStaticLib.h"
#include "devSup.h"
#include "epicsEvent.h"
#include "errMdef.h"
#include "link.h"
#include "recGbl.h"
#include "recSup.h"
#include "special.h"
/***************************** Constant Links *****************************/

View File

@@ -78,7 +78,8 @@ long dbDbInitLink(struct link *plink, short dbfType)
return 0;
}
void dbDbAddLink(dbLocker *locker, struct link *plink, short dbfType, DBADDR *ptarget)
void dbDbAddLink(struct dbLocker *locker, struct link *plink, short dbfType,
DBADDR *ptarget)
{
plink->lset = &dbDb_lset;
plink->type = DB_LINK;
@@ -89,7 +90,7 @@ void dbDbAddLink(dbLocker *locker, struct link *plink, short dbfType, DBADDR *pt
dbLockSetMerge(locker, plink->precord, ptarget->precord);
}
static void dbDbRemoveLink(dbLocker *locker, struct link *plink)
static void dbDbRemoveLink(struct dbLocker *locker, struct link *plink)
{
DBADDR *pdbAddr = (DBADDR *) plink->value.pv_link.pvt;
plink->value.pv_link.pvt = 0;

View File

@@ -38,7 +38,6 @@
#include "db_field_log.h"
#include "dbFldTypes.h"
#include "dbLink.h"
#include "dbLockPvt.h"
#include "dbScan.h"
#include "dbStaticLib.h"
#include "devSup.h"
@@ -110,7 +109,8 @@ void dbInitLink(struct link *plink, short dbfType)
}
}
void dbAddLink(dbLocker *locker, struct link *plink, short dbfType, DBADDR *ptarget)
void dbAddLink(dbLocker *locker, struct link *plink, short dbfType,
DBADDR *ptarget)
{
struct dbCommon *precord = plink->precord;
@@ -201,7 +201,7 @@ long dbGetLink(struct link *plink, short dbrType, void *pbuffer,
long status;
if (poptions && *poptions) {
printf("dbGetLinkValue: Use of poptions no longer supported\n");
printf("dbGetLink: Use of poptions no longer supported\n");
*poptions = 0;
}