From e40970bd5e0362303bdacdd9cbcba2b0cbf93186 Mon Sep 17 00:00:00 2001
From: Michael Davidsaver <mdavidsaver@gmail.com>
Date: Mon, 15 Jun 2020 13:58:33 -0700
Subject: [PATCH] rename dynamic_registerRecordDeviceDriver ->
 registerAllRecordDeviceDrivers

---
 modules/database/src/ioc/misc/Makefile                      | 2 +-
 modules/database/src/ioc/misc/iocshRegisterCommon.c         | 6 +++---
 modules/database/src/ioc/misc/iocshRegisterCommon.h         | 2 +-
 ...dDeviceDriver.cpp => registerAllRecordDeviceDrivers.cpp} | 4 ++--
 modules/database/test/std/rec/analogMonitorTest.c           | 6 +++---
 5 files changed, 10 insertions(+), 10 deletions(-)
 rename modules/database/src/ioc/misc/{dynamic_registerRecordDeviceDriver.cpp => registerAllRecordDeviceDrivers.cpp} (97%)

diff --git a/modules/database/src/ioc/misc/Makefile b/modules/database/src/ioc/misc/Makefile
index 6658acd08..8c7140390 100644
--- a/modules/database/src/ioc/misc/Makefile
+++ b/modules/database/src/ioc/misc/Makefile
@@ -25,6 +25,6 @@ dbCore_SRCS += iocInit.c
 dbCore_SRCS += miscIocRegister.c
 dbCore_SRCS += dlload.c
 dbCore_SRCS += iocshRegisterCommon.c
-dbCore_SRCS += dynamic_registerRecordDeviceDriver.cpp
+dbCore_SRCS += registerAllRecordDeviceDrivers.cpp
 
 miscIocRegister_CFLAGS_iOS = -DSYSTEM_UNAVAILABLE
diff --git a/modules/database/src/ioc/misc/iocshRegisterCommon.c b/modules/database/src/ioc/misc/iocshRegisterCommon.c
index fcc1796c4..205e17859 100644
--- a/modules/database/src/ioc/misc/iocshRegisterCommon.c
+++ b/modules/database/src/ioc/misc/iocshRegisterCommon.c
@@ -26,14 +26,14 @@
 #define quote(v) #v
 #define str(v) quote(v)
 
-/* dynamic_registerRecordDeviceDriver */
+/* registerAllRecordDeviceDrivers */
 static const iocshArg rrddArg0 = {"pdbbase", iocshArgPdbbase};
 static const iocshArg *rrddArgs[] = {&rrddArg0};
 static const iocshFuncDef rrddFuncDef =
-    {"dynamic_registerRecordDeviceDriver", 1, rrddArgs};
+    {"registerAllRecordDeviceDrivers", 1, rrddArgs};
 static void rrddCallFunc(const iocshArgBuf *args)
 {
-    iocshSetError(dynamic_registerRecordDeviceDriver(*iocshPpdbbase));
+    iocshSetError(registerAllRecordDeviceDrivers(*iocshPpdbbase));
 }
 
 void iocshRegisterCommon(void)
diff --git a/modules/database/src/ioc/misc/iocshRegisterCommon.h b/modules/database/src/ioc/misc/iocshRegisterCommon.h
index bb530dc01..7e28676f9 100644
--- a/modules/database/src/ioc/misc/iocshRegisterCommon.h
+++ b/modules/database/src/ioc/misc/iocshRegisterCommon.h
@@ -26,7 +26,7 @@ epicsShareFunc void iocshRegisterCommon(void);
 
 epicsShareFunc
 long
-dynamic_registerRecordDeviceDriver(struct dbBase *pdbbase);
+registerAllRecordDeviceDrivers(struct dbBase *pdbbase);
 
 epicsShareFunc
 void runRegistrarOnce(void (*reg_func)(void));
diff --git a/modules/database/src/ioc/misc/dynamic_registerRecordDeviceDriver.cpp b/modules/database/src/ioc/misc/registerAllRecordDeviceDrivers.cpp
similarity index 97%
rename from modules/database/src/ioc/misc/dynamic_registerRecordDeviceDriver.cpp
rename to modules/database/src/ioc/misc/registerAllRecordDeviceDrivers.cpp
index 8c28d55db..8304ede1a 100644
--- a/modules/database/src/ioc/misc/dynamic_registerRecordDeviceDriver.cpp
+++ b/modules/database/src/ioc/misc/registerAllRecordDeviceDrivers.cpp
@@ -98,12 +98,12 @@ void clearRegistrarOnce()
 }
 
 long
-dynamic_registerRecordDeviceDriver(DBBASE *pdbbase)
+registerAllRecordDeviceDrivers(DBBASE *pdbbase)
 {
     DBENTRY entry;
 
     if(!pdbbase) {
-        fprintf(stderr, "Must call dbLoadRecords() before dynamic_registerRecordDeviceDriver(pdbbase)\n");
+        fprintf(stderr, "Must call dbLoadRecords() before registerAllRecordDeviceDrivers(pdbbase)\n");
         return 1;
     }
 
diff --git a/modules/database/test/std/rec/analogMonitorTest.c b/modules/database/test/std/rec/analogMonitorTest.c
index 55f0ee51e..5f79d7767 100644
--- a/modules/database/test/std/rec/analogMonitorTest.c
+++ b/modules/database/test/std/rec/analogMonitorTest.c
@@ -162,10 +162,10 @@ MAIN(analogMonitorTest)
             "../O.Common" OSI_PATH_LIST_SEPARATOR "O.Common", NULL))
         testAbort("Error reading database description 'analogMonitorTest.dbd'");
 
-    /* testing dynamic_registerRecordDeviceDriver() */
-    dynamic_registerRecordDeviceDriver(pdbbase);
+    /* testing registerAllRecordDeviceDrivers() */
+    registerAllRecordDeviceDrivers(pdbbase);
     analogMonitorTest_registerRecordDeviceDriver(pdbbase);
-    dynamic_registerRecordDeviceDriver(pdbbase);
+    registerAllRecordDeviceDrivers(pdbbase);
 
     if (dbReadDatabase(&pdbbase, "analogMonitorTest.db",
             "." OSI_PATH_LIST_SEPARATOR "..", NULL))