From 2eaede9925f92b887e40561c12ef3b25d23eb1b1 Mon Sep 17 00:00:00 2001 From: Michael Davidsaver Date: Mon, 1 May 2017 15:28:57 -0400 Subject: [PATCH] rename dbInitEntryFromChannel -> dbInitEntryFromAddr --- src/ioc/db/dbAccess.c | 2 +- src/ioc/db/test/dbStaticTest.c | 2 +- src/ioc/dbStatic/dbStaticLib.h | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/ioc/db/dbAccess.c b/src/ioc/db/dbAccess.c index ae21634b2..df6b7adc8 100644 --- a/src/ioc/db/dbAccess.c +++ b/src/ioc/db/dbAccess.c @@ -682,7 +682,7 @@ finish: return status; } -void dbInitEntryFromChannel(struct dbAddr *paddr, DBENTRY *pdbentry) +void dbInitEntryFromAddr(struct dbAddr *paddr, DBENTRY *pdbentry) { struct dbCommon *prec = paddr->precord; dbCommonPvt *ppvt = CONTAINER(prec, dbCommonPvt, common); diff --git a/src/ioc/db/test/dbStaticTest.c b/src/ioc/db/test/dbStaticTest.c index b6110162b..77d0dc33c 100644 --- a/src/ioc/db/test/dbStaticTest.c +++ b/src/ioc/db/test/dbStaticTest.c @@ -44,7 +44,7 @@ static void testAddr2Entry(void) if(dbNameToAddr("testrec.VAL", &addr)) testAbort("no addr for testrec.VAL"); - dbInitEntryFromChannel(&addr, &entry2); + dbInitEntryFromAddr(&addr, &entry2); testOk1(entry.pdbbase==entry2.pdbbase); testOk1(entry.precordType==entry2.precordType); diff --git a/src/ioc/dbStatic/dbStaticLib.h b/src/ioc/dbStatic/dbStaticLib.h index 23eeba349..32fa584c4 100644 --- a/src/ioc/dbStatic/dbStaticLib.h +++ b/src/ioc/dbStatic/dbStaticLib.h @@ -73,7 +73,7 @@ epicsShareFunc void dbInitEntry(DBBASE *pdbbase, * Constant time equivalent of dbInitEntry() then dbFindRecord() * except that DBENTRY::indfield is not set */ -epicsShareFunc void dbInitEntryFromChannel(struct dbAddr *paddr, DBENTRY *pdbentry); +epicsShareFunc void dbInitEntryFromAddr(struct dbAddr *paddr, DBENTRY *pdbentry); epicsShareFunc void dbFinishEntry(DBENTRY *pdbentry); epicsShareFunc DBENTRY * dbCopyEntry(DBENTRY *pdbentry); epicsShareFunc void dbCopyEntryContents(DBENTRY *pfrom,