From 0348c2295bb2b5f8cc3f7f7127c4b7e35f3664d7 Mon Sep 17 00:00:00 2001
From: Andrew Johnson <anj@aps.anl.gov>
Date: Tue, 26 Apr 2016 22:13:12 -0500
Subject: [PATCH] Cleanup

---
 src/ioc/db/dbConstLink.c | 22 ----------------------
 src/ioc/db/dbDbLink.c    |  5 +++--
 src/ioc/db/dbLink.c      |  6 +++---
 3 files changed, 6 insertions(+), 27 deletions(-)

diff --git a/src/ioc/db/dbConstLink.c b/src/ioc/db/dbConstLink.c
index 4666d6138..022ba7fe9 100644
--- a/src/ioc/db/dbConstLink.c
+++ b/src/ioc/db/dbConstLink.c
@@ -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 *****************************/
 
diff --git a/src/ioc/db/dbDbLink.c b/src/ioc/db/dbDbLink.c
index f35791f7d..46c4b7ef6 100644
--- a/src/ioc/db/dbDbLink.c
+++ b/src/ioc/db/dbDbLink.c
@@ -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;
diff --git a/src/ioc/db/dbLink.c b/src/ioc/db/dbLink.c
index c14fecc73..2f8195cc8 100644
--- a/src/ioc/db/dbLink.c
+++ b/src/ioc/db/dbLink.c
@@ -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;
     }