From bbbf05414da5bcc6ec9a3a897b329588003676db Mon Sep 17 00:00:00 2001
From: Michael Davidsaver <mdavidsaver@bnl.gov>
Date: Tue, 17 Feb 2015 11:31:05 -0500
Subject: [PATCH] dbScan: rename scanOnce3 to scanOnceCallback

---
 src/ioc/db/dbCa.c            | 4 ++--
 src/ioc/db/dbScan.c          | 4 ++--
 src/ioc/db/dbScan.h          | 2 +-
 src/ioc/db/test/dbScanTest.c | 4 ++--
 4 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/src/ioc/db/dbCa.c b/src/ioc/db/dbCa.c
index 2e1bf2ebf..f6422873b 100644
--- a/src/ioc/db/dbCa.c
+++ b/src/ioc/db/dbCa.c
@@ -637,7 +637,7 @@ static void scanComplete(void *raw, dbCommon *prec)
         errlogPrintf("dbCa.c complete callback w/ scanningOnce==0\n");
     else if(--pca->scanningOnce){
         /* another scan is queued */
-        if(scanOnce3(prec, scanComplete, raw)) {
+        if(scanOnceCallback(prec, scanComplete, raw)) {
             errlogPrintf("dbCa.c failed to re-queue scanOnce\n");
         }
     }
@@ -646,7 +646,7 @@ static void scanComplete(void *raw, dbCommon *prec)
 
 /* must be called with pca->lock held */
 static void scanLinkOnce(dbCommon *prec, caLink *pca) {
-    if(pca->scanningOnce==0 && scanOnce3(prec, scanComplete, pca)) {
+    if(pca->scanningOnce==0 && scanOnceCallback(prec, scanComplete, pca)) {
         errlogPrintf("dbCa.c failed to queue scanOnce\n");
     }
     if(pca->scanningOnce<5)
diff --git a/src/ioc/db/dbScan.c b/src/ioc/db/dbScan.c
index 9dfeec0bc..e0f2b3603 100644
--- a/src/ioc/db/dbScan.c
+++ b/src/ioc/db/dbScan.c
@@ -612,7 +612,7 @@ void scanIoSetComplete(IOSCANPVT piosh, io_scan_complete cb, void *arg)
 }
 
 int scanOnce(struct dbCommon *precord) {
-    return scanOnce3(precord, NULL, NULL);
+    return scanOnceCallback(precord, NULL, NULL);
 }
 
 typedef struct {
@@ -621,7 +621,7 @@ typedef struct {
     void *usr;
 } onceEntry;
 
-int scanOnce3(struct dbCommon *precord, once_complete cb, void *usr)
+int scanOnceCallback(struct dbCommon *precord, once_complete cb, void *usr)
 {
     static int newOverflow = TRUE;
     onceEntry ent;
diff --git a/src/ioc/db/dbScan.h b/src/ioc/db/dbScan.h
index fffae23d1..422864a0a 100644
--- a/src/ioc/db/dbScan.h
+++ b/src/ioc/db/dbScan.h
@@ -56,7 +56,7 @@ epicsShareFunc void scanAdd(struct dbCommon *);
 epicsShareFunc void scanDelete(struct dbCommon *);
 epicsShareFunc double scanPeriod(int scan);
 epicsShareFunc int scanOnce(struct dbCommon *);
-epicsShareFunc int scanOnce3(struct dbCommon *, once_complete cb, void *usr);
+epicsShareFunc int scanOnceCallback(struct dbCommon *, once_complete cb, void *usr);
 epicsShareFunc int scanOnceSetQueueSize(int size);
 
 /*print periodic lists*/
diff --git a/src/ioc/db/test/dbScanTest.c b/src/ioc/db/test/dbScanTest.c
index f9f1f8e44..0815827e3 100644
--- a/src/ioc/db/test/dbScanTest.c
+++ b/src/ioc/db/test/dbScanTest.c
@@ -36,7 +36,7 @@ static void onceComp(void *junk, dbCommon *prec)
 
 static void testOnce(void)
 {
-    testDiag("check scanOnce3() callback");
+    testDiag("check scanOnceCallback() callback");
     waiter = epicsEventMustCreate(epicsEventError);
 
     testdbPrepare();
@@ -52,7 +52,7 @@ static void testOnce(void)
     prec = testdbRecordPtr("reca");
 
     testDiag("scanOnce %s", prec->name);
-    scanOnce3(prec, onceComp, &waiter);
+    scanOnceCallback(prec, onceComp, &waiter);
     testDiag("Waiting");
     epicsEventMustWait(waiter);
     testOk1(called==1);