From 89b9e240b0c81938629037803bd08e5818d86884 Mon Sep 17 00:00:00 2001
From: Andrew Johnson <anj@aps.anl.gov>
Date: Fri, 1 Jun 2018 23:43:39 -0500
Subject: [PATCH] Link types: Remove debug tracing now provided by debug link
 type

---
 src/std/link/links.dbd.pod |   3 --
 src/std/link/lnkCalc.c     |  88 -------------------------------
 src/std/link/lnkConst.c    | 104 +++++++------------------------------
 src/std/link/lnkState.c    |  59 +--------------------
 4 files changed, 22 insertions(+), 232 deletions(-)

diff --git a/src/std/link/links.dbd.pod b/src/std/link/links.dbd.pod
index bf13bf7a9..b5ed582f2 100644
--- a/src/std/link/links.dbd.pod
+++ b/src/std/link/links.dbd.pod
@@ -39,7 +39,6 @@ database file syntax.
 
 
 link(const, lnkConstIf)
-variable(lnkConst_debug, int)
 
 =head3 Constant Link C<"const">
 
@@ -80,7 +79,6 @@ converted to the desired double value at initialization, for example:
 
 
 link(calc, lnkCalcIf)
-variable(lnkCalc_debug, int)
 
 =head3 Calculation Link C<"calc">
 
@@ -169,7 +167,6 @@ atomically with the value of the input argument.
 
 
 link(state, lnkStateIf)
-variable(lnkState_debug, int)
 
 =head3 dbState Link C<"state">
 
diff --git a/src/std/link/lnkCalc.c b/src/std/link/lnkCalc.c
index 6b68ac990..fa1a363fe 100644
--- a/src/std/link/lnkCalc.c
+++ b/src/std/link/lnkCalc.c
@@ -37,11 +37,6 @@
 
 typedef long (*FASTCONVERT)();
 
-int lnkCalc_debug;
-epicsExportAddress(int, lnkCalc_debug);
-
-#define IFDEBUG(n) if (lnkCalc_debug >= (n))
-
 typedef struct calc_link {
     jlink jlink;        /* embedded object */
     int nArgs;
@@ -82,9 +77,6 @@ static jlink* lnkCalc_alloc(short dbfType)
 {
     calc_link *clink;
 
-    IFDEBUG(10)
-        printf("lnkCalc_alloc(%d)\n", dbfType);
-
     if (dbfType == DBF_FWDLINK) {
         errlogPrintf("lnkCalc: No support for forward links\n");
         return NULL;
@@ -102,9 +94,6 @@ static jlink* lnkCalc_alloc(short dbfType)
     clink->prec = 15;   /* standard value for a double */
     clink->tinp = -1;
 
-    IFDEBUG(10)
-        printf("lnkCalc_alloc -> calc@%p\n", clink);
-
     return &clink->jlink;
 }
 
@@ -113,9 +102,6 @@ static void lnkCalc_free(jlink *pjlink)
     calc_link *clink = CONTAINER(pjlink, struct calc_link, jlink);
     int i;
 
-    IFDEBUG(10)
-        printf("lnkCalc_free(calc@%p)\n", clink);
-
     for (i = 0; i < clink->nArgs; i++)
         dbJLinkFree(clink->inp[i].value.json.jlink);
 
@@ -135,9 +121,6 @@ static jlif_result lnkCalc_integer(jlink *pjlink, long long num)
 {
     calc_link *clink = CONTAINER(pjlink, struct calc_link, jlink);
 
-    IFDEBUG(10)
-        printf("lnkCalc_integer(calc@%p, %lld)\n", clink, num);
-
     if (clink->pstate == ps_prec) {
         clink->prec = num;
         return jlif_continue;
@@ -163,9 +146,6 @@ static jlif_result lnkCalc_double(jlink *pjlink, double num)
 {
     calc_link *clink = CONTAINER(pjlink, struct calc_link, jlink);
 
-    IFDEBUG(10)
-        printf("lnkCalc_double(calc@%p, %g)\n", clink, num);
-
     if (clink->pstate != ps_args) {
         return jlif_stop;
         errlogPrintf("lnkCalc: Unexpected double %g\n", num);
@@ -188,9 +168,6 @@ static jlif_result lnkCalc_string(jlink *pjlink, const char *val, size_t len)
     char *inbuf, *postbuf;
     short err;
 
-    IFDEBUG(10)
-        printf("lnkCalc_string(calc@%p, \"%.*s\")\n", clink, (int) len, val);
-
     if (clink->pstate == ps_units) {
         clink->units = epicsStrnDup(val, len);
         return jlif_continue;
@@ -251,9 +228,6 @@ static jlif_key_result lnkCalc_start_map(jlink *pjlink)
 {
     calc_link *clink = CONTAINER(pjlink, struct calc_link, jlink);
 
-    IFDEBUG(10)
-        printf("lnkCalc_start_map(calc@%p)\n", clink);
-
     if (clink->pstate == ps_args)
         return jlif_key_child_inlink;
     if (clink->pstate == ps_out)
@@ -271,9 +245,6 @@ static jlif_result lnkCalc_map_key(jlink *pjlink, const char *key, size_t len)
 {
     calc_link *clink = CONTAINER(pjlink, struct calc_link, jlink);
 
-    IFDEBUG(10)
-        printf("lnkCalc_map_key(calc@%p, \"%.*s\")\n", pjlink, (int) len, key);
-
     /* FIXME: These errors messages are wrong when a key is duplicated.
      * The key is known, we just don't allow it more than once.
      */
@@ -326,9 +297,6 @@ static jlif_result lnkCalc_end_map(jlink *pjlink)
 {
     calc_link *clink = CONTAINER(pjlink, struct calc_link, jlink);
 
-    IFDEBUG(10)
-        printf("lnkCalc_end_map(calc@%p)\n", clink);
-
     if (clink->pstate == ps_error)
         return jlif_stop;
     else if (clink->dbfType == DBF_INLINK &&
@@ -349,9 +317,6 @@ static jlif_result lnkCalc_start_array(jlink *pjlink)
 {
     calc_link *clink = CONTAINER(pjlink, struct calc_link, jlink);
 
-    IFDEBUG(10)
-        printf("lnkCalc_start_array(calc@%p)\n", clink);
-
     if (clink->pstate != ps_args) {
         errlogPrintf("lnkCalc: Unexpected array\n");
         return jlif_stop;
@@ -364,9 +329,6 @@ static jlif_result lnkCalc_end_array(jlink *pjlink)
 {
     calc_link *clink = CONTAINER(pjlink, struct calc_link, jlink);
 
-    IFDEBUG(10)
-        printf("lnkCalc_end_array(calc@%p)\n", clink);
-
     if (clink->pstate == ps_error)
         return jlif_stop;
 
@@ -406,9 +368,6 @@ errOut:
 
 static struct lset* lnkCalc_get_lset(const jlink *pjlink)
 {
-    IFDEBUG(10)
-        printf("lnkCalc_get_lset(calc@%p)\n", pjlink);
-
     return &lnkCalc_lset;
 }
 
@@ -417,9 +376,6 @@ static void lnkCalc_report(const jlink *pjlink, int level, int indent)
     calc_link *clink = CONTAINER(pjlink, struct calc_link, jlink);
     int i;
 
-    IFDEBUG(10)
-        printf("lnkCalc_report(calc@%p)\n", clink);
-
     printf("%*s'calc': \"%s\" = %.*g %s\n", indent, "",
         clink->expr, clink->prec, clink->val,
         clink->units ? clink->units : "");
@@ -470,9 +426,6 @@ static long lnkCalc_map_children(jlink *pjlink, jlink_map_fn rtn, void *ctx)
     calc_link *clink = CONTAINER(pjlink, struct calc_link, jlink);
     int i;
 
-    IFDEBUG(10)
-        printf("lnkCalc_map_children(calc@%p)\n", clink);
-
     for (i = 0; i < clink->nArgs; i++) {
         struct link *child = &clink->inp[i];
         long status = dbJLinkMapChildren(child, rtn, ctx);
@@ -495,9 +448,6 @@ static void lnkCalc_open(struct link *plink)
         struct calc_link, jlink);
     int i;
 
-    IFDEBUG(10)
-        printf("lnkCalc_open(calc@%p)\n", clink);
-
     for (i = 0; i < clink->nArgs; i++) {
         struct link *child = &clink->inp[i];
 
@@ -517,9 +467,6 @@ static void lnkCalc_remove(struct dbLocker *locker, struct link *plink)
         struct calc_link, jlink);
     int i;
 
-    IFDEBUG(10)
-        printf("lnkCalc_remove(calc@%p)\n", clink);
-
     for (i = 0; i < clink->nArgs; i++) {
         struct link *child = &clink->inp[i];
 
@@ -548,9 +495,6 @@ static int lnkCalc_isConn(const struct link *plink)
     int connected = 1;
     int i;
 
-    IFDEBUG(10)
-        printf("lnkCalc_isConn(calc@%p)\n", clink);
-
     for (i = 0; i < clink->nArgs; i++) {
         struct link *child = &clink->inp[i];
 
@@ -572,24 +516,11 @@ static int lnkCalc_isConn(const struct link *plink)
 
 static int lnkCalc_getDBFtype(const struct link *plink)
 {
-    calc_link *clink = CONTAINER(plink->value.json.jlink,
-        struct calc_link, jlink);
-
-    IFDEBUG(10)
-        printf("lnkCalc_getDBFtype(calc@%p)\n", clink);
-
     return DBF_DOUBLE;
 }
 
 static long lnkCalc_getElements(const struct link *plink, long *nelements)
 {
-    calc_link *clink = CONTAINER(plink->value.json.jlink,
-        struct calc_link, jlink);
-
-    IFDEBUG(10)
-        printf("lnkCalc_getElements(calc@%p, (%ld))\n",
-            clink, *nelements);
-
     *nelements = 1;
     return 0;
 }
@@ -622,10 +553,6 @@ static long lnkCalc_getValue(struct link *plink, short dbrType, void *pbuffer,
     long status;
     FASTCONVERT conv = dbFastPutConvertRoutine[DBR_DOUBLE][dbrType];
 
-    IFDEBUG(10)
-        printf("lnkCalc_getValue(calc@%p, %d, ...)\n",
-            clink, dbrType);
-
     /* Any link errors will trigger a LINK/INVALID alarm in the child link */
     for (i = 0; i < clink->nArgs; i++) {
         struct link *child = &clink->inp[i];
@@ -697,9 +624,6 @@ static long lnkCalc_putValue(struct link *plink, short dbrType,
     long status;
     FASTCONVERT conv = dbFastGetConvertRoutine[dbrType][DBR_DOUBLE];
 
-    IFDEBUG(10)
-        printf("lnkCalc_putValue(calc@%p, %d, ...)\n", clink, dbrType);
-
     /* Any link errors will trigger a LINK/INVALID alarm in the child link */
     for (i = 0; i < clink->nArgs; i++) {
         struct link *child = &clink->inp[i];
@@ -763,9 +687,6 @@ static long lnkCalc_getPrecision(const struct link *plink, short *precision)
     calc_link *clink = CONTAINER(plink->value.json.jlink,
         struct calc_link, jlink);
 
-    IFDEBUG(10)
-        printf("lnkCalc_getPrecision(calc@%p)\n", clink);
-
     *precision = clink->prec;
     return 0;
 }
@@ -775,9 +696,6 @@ static long lnkCalc_getUnits(const struct link *plink, char *units, int len)
     calc_link *clink = CONTAINER(plink->value.json.jlink,
         struct calc_link, jlink);
 
-    IFDEBUG(10)
-        printf("lnkCalc_getUnits(calc@%p)\n", clink);
-
     if (clink->units) {
         strncpy(units, clink->units, --len);
         units[len] = '\0';
@@ -793,9 +711,6 @@ static long lnkCalc_getAlarm(const struct link *plink, epicsEnum16 *status,
     calc_link *clink = CONTAINER(plink->value.json.jlink,
         struct calc_link, jlink);
 
-    IFDEBUG(10)
-        printf("lnkCalc_getAlarm(calc@%p)\n", clink);
-
     if (status)
         *status = clink->stat;
     if (severity)
@@ -809,9 +724,6 @@ static long lnkCalc_getTimestamp(const struct link *plink, epicsTimeStamp *pstam
     calc_link *clink = CONTAINER(plink->value.json.jlink,
         struct calc_link, jlink);
 
-    IFDEBUG(10)
-        printf("lnkCalc_getTimestamp(calc@%p)\n", clink);
-
     if (clink->tinp >= 0) {
         *pstamp = clink->time;
         return 0;
diff --git a/src/std/link/lnkConst.c b/src/std/link/lnkConst.c
index 3b9392cfa..cb948fcb3 100644
--- a/src/std/link/lnkConst.c
+++ b/src/std/link/lnkConst.c
@@ -22,11 +22,6 @@
 #include "epicsExport.h"
 
 
-int lnkConst_debug;
-epicsExportAddress(int, lnkConst_debug);
-
-#define IFDEBUG(n) if (lnkConst_debug >= (n))
-
 typedef long (*FASTCONVERT)();
 
 typedef struct const_link {
@@ -53,9 +48,6 @@ static jlink* lnkConst_alloc(short dbfType)
 {
     const_link *clink;
 
-    IFDEBUG(10)
-        printf("lnkConst_alloc(%d)\n", dbfType);
-
     if (dbfType != DBF_INLINK) {
         errlogPrintf("lnkConst: Only works with input links\n");
         return NULL;
@@ -71,9 +63,6 @@ static jlink* lnkConst_alloc(short dbfType)
     clink->nElems = 0;
     clink->value.pmem = NULL;
 
-    IFDEBUG(10)
-        printf("lnkConst_alloc -> const@%p\n", clink);
-
     return &clink->jlink;
 }
 
@@ -81,9 +70,6 @@ static void lnkConst_free(jlink *pjlink)
 {
     const_link *clink = CONTAINER(pjlink, const_link, jlink);
 
-    IFDEBUG(10)
-        printf("lnkConst_free(const@%p) type=%d\n", pjlink, clink->type);
-
     switch (clink->type) {
         int i;
     case ac40:
@@ -109,16 +95,13 @@ static jlif_result lnkConst_integer(jlink *pjlink, long long num)
     const_link *clink = CONTAINER(pjlink, const_link, jlink);
     int newElems = clink->nElems + 1;
 
-    IFDEBUG(10)
-        printf("lnkConst_integer(const@%p, %lld)\n", pjlink, num);
-
     switch (clink->type) {
         void *buf;
 
     case s0:
         clink->type = si64;
         clink->value.scalar_integer = num;
-        IFDEBUG(12)
+        if (pjlink->debug)
             printf("   si64 := %lld\n", num);
         break;
 
@@ -132,7 +115,7 @@ static jlif_result lnkConst_integer(jlink *pjlink, long long num)
 
         clink->value.pmem = buf;
         clink->value.pintegers[clink->nElems] = num;
-        IFDEBUG(12)
+        if (pjlink->debug)
             printf("   ai64 += %lld\n", num);
         break;
 
@@ -143,7 +126,7 @@ static jlif_result lnkConst_integer(jlink *pjlink, long long num)
 
         clink->value.pmem = buf;
         clink->value.pdoubles[clink->nElems] = num;
-        IFDEBUG(12)
+        if (pjlink->debug)
             printf("   af64 += %lld\n", num);
         break;
 
@@ -160,9 +143,6 @@ static jlif_result lnkConst_integer(jlink *pjlink, long long num)
 
 static jlif_result lnkConst_boolean(jlink *pjlink, int val)
 {
-    IFDEBUG(10)
-        printf("lnkConst_boolean(const@%p, %d)\n", pjlink, val);
-
     return lnkConst_integer(pjlink, val);
 }
 
@@ -171,9 +151,6 @@ static jlif_result lnkConst_double(jlink *pjlink, double num)
     const_link *clink = CONTAINER(pjlink, const_link, jlink);
     int newElems = clink->nElems + 1;
 
-    IFDEBUG(10)
-        printf("lnkConst_double(const@%p, %g)\n", pjlink, num);
-
     switch (clink->type) {
         epicsFloat64 *f64buf;
         int i;
@@ -225,9 +202,6 @@ static jlif_result lnkConst_string(jlink *pjlink, const char *val, size_t len)
     const_link *clink = CONTAINER(pjlink, const_link, jlink);
     int newElems = clink->nElems + 1;
 
-    IFDEBUG(10)
-        printf("lnkConst_string(const@%p, \"%.*s\")\n", clink, (int) len, val);
-
     switch (clink->type) {
         char **vec, *str;
 
@@ -275,9 +249,6 @@ static jlif_result lnkConst_start_array(jlink *pjlink)
 {
     const_link *clink = CONTAINER(pjlink, const_link, jlink);
 
-    IFDEBUG(10)
-        printf("lnkConst_start_array(const@%p)\n", pjlink);
-
     if (clink->type != s0) {
         errlogPrintf("lnkConst: Embedded array value\n");
         return jlif_stop;
@@ -289,17 +260,11 @@ static jlif_result lnkConst_start_array(jlink *pjlink)
 
 static jlif_result lnkConst_end_array(jlink *pjlink)
 {
-    IFDEBUG(10)
-        printf("lnkConst_end_array(const@%p)\n", pjlink);
-
     return jlif_continue;
 }
 
 static struct lset* lnkConst_get_lset(const jlink *pjlink)
 {
-    IFDEBUG(10)
-        printf("lnkConst_get_lset(const@%p)\n", pjlink);
-
     return &lnkConst_lset;
 }
 
@@ -327,9 +292,6 @@ static void lnkConst_report(const jlink *pjlink, int level, int indent)
     };
     const char * const dtype = type_names[clink->type & 3];
 
-    IFDEBUG(10)
-        printf("lnkConst_report(const@%p)\n", clink);
-
     if (clink->type > a0) {
         const char * const plural = clink->nElems > 1 ? "s" : "";
 
@@ -391,11 +353,6 @@ static void lnkConst_report(const jlink *pjlink, int level, int indent)
 
 static void lnkConst_remove(struct dbLocker *locker, struct link *plink)
 {
-    const_link *clink = CONTAINER(plink->value.json.jlink, const_link, jlink);
-
-    IFDEBUG(10)
-        printf("lnkConst_remove(const@%p)\n", clink);
-
     lnkConst_free(plink->value.json.jlink);
 }
 
@@ -404,55 +361,51 @@ static long lnkConst_loadScalar(struct link *plink, short dbrType, void *pbuffer
     const_link *clink = CONTAINER(plink->value.json.jlink, const_link, jlink);
     long status;
 
-    IFDEBUG(10)
-        printf("lnkConst_loadScalar(const@%p, %d, %p)\n",
-            clink, dbrType, pbuffer);
-
     switch (clink->type) {
     case si64:
-        IFDEBUG(12)
+        if (clink->jlink.debug)
             printf("   si64 %lld\n", clink->value.scalar_integer);
         status = dbFastPutConvertRoutine[DBF_INT64][dbrType]
             (&clink->value.scalar_integer, pbuffer, NULL);
         break;
 
     case sf64:
-        IFDEBUG(12)
+        if (clink->jlink.debug)
             printf("   sf64 %g\n", clink->value.scalar_double);
         status = dbFastPutConvertRoutine[DBF_DOUBLE][dbrType]
             (&clink->value.scalar_double, pbuffer, NULL);
         break;
 
     case sc40:
-        IFDEBUG(12)
+        if (clink->jlink.debug)
             printf("   sc40 '%s'\n", clink->value.scalar_string);
         status = dbFastPutConvertRoutine[DBF_STRING][dbrType]
             (clink->value.scalar_string, pbuffer, NULL);
         break;
 
     case ai64:
-        IFDEBUG(12)
+        if (clink->jlink.debug)
             printf("   ai64 [%lld, ...]\n", clink->value.pintegers[0]);
         status = dbFastPutConvertRoutine[DBF_INT64][dbrType]
             (clink->value.pintegers, pbuffer, NULL);
         break;
 
     case af64:
-        IFDEBUG(12)
+        if (clink->jlink.debug)
             printf("   af64 [%g, ...]\n", clink->value.pdoubles[0]);
         status = dbFastPutConvertRoutine[DBF_DOUBLE][dbrType]
             (clink->value.pdoubles, pbuffer, NULL);
         break;
 
     case ac40:
-        IFDEBUG(12)
+        if (clink->jlink.debug)
             printf("   ac40 ['%s', ...]\n", clink->value.pstrings[0]);
         status = dbFastPutConvertRoutine[DBF_STRING][dbrType]
             (clink->value.pstrings[0], pbuffer, NULL);
         break;
 
     default:
-        IFDEBUG(12)
+        if (clink->jlink.debug)
             printf("   Bad type %d\n", clink->type);
         status = S_db_badField;
         break;
@@ -467,27 +420,23 @@ static long lnkConst_loadLS(struct link *plink, char *pbuffer, epicsUInt32 size,
     const_link *clink = CONTAINER(plink->value.json.jlink, const_link, jlink);
     const char *pstr;
 
-    IFDEBUG(10)
-        printf("lnkConst_loadLS(const@%p, %p, %d, %d)\n",
-            clink, pbuffer, size, *plen);
-
     if(!size) return 0;
 
     switch (clink->type) {
     case sc40:
-        IFDEBUG(12)
+        if (clink->jlink.debug)
             printf("   sc40 '%s'\n", clink->value.scalar_string);
         pstr = clink->value.scalar_string;
         break;
 
     case ac40:
-        IFDEBUG(12)
+        if (clink->jlink.debug)
             printf("   ac40 ['%s', ...]\n", clink->value.pstrings[0]);
         pstr = clink->value.pstrings[0];
         break;
 
     default:
-        IFDEBUG(12)
+        if (clink->jlink.debug)
             printf("   Bad type %d\n", clink->type);
         return S_db_badField;
     }
@@ -508,10 +457,6 @@ static long lnkConst_loadArray(struct link *plink, short dbrType, void *pbuffer,
     FASTCONVERT conv;
     long status;
 
-    IFDEBUG(10)
-        printf("lnkConst_loadArray(const@%p, %d, %p, (%ld))\n",
-            clink, dbrType, pbuffer, *pnReq);
-
     if (nElems > *pnReq)
         nElems = *pnReq;
 
@@ -519,28 +464,28 @@ static long lnkConst_loadArray(struct link *plink, short dbrType, void *pbuffer,
         int i;
 
     case si64:
-        IFDEBUG(12)
+        if (clink->jlink.debug)
             printf("   si64 %lld\n", clink->value.scalar_integer);
         status = dbFastPutConvertRoutine[DBF_INT64][dbrType]
             (&clink->value.scalar_integer, pdest, NULL);
         break;
 
     case sf64:
-        IFDEBUG(12)
+        if (clink->jlink.debug)
             printf("   sf64 %g\n", clink->value.scalar_double);
         status = dbFastPutConvertRoutine[DBF_DOUBLE][dbrType]
             (&clink->value.scalar_double, pdest, NULL);
         break;
 
     case sc40:
-        IFDEBUG(12)
+        if (clink->jlink.debug)
             printf("   sc40 '%s'\n", clink->value.scalar_string);
         status = dbFastPutConvertRoutine[DBF_STRING][dbrType]
             (clink->value.scalar_string, pbuffer, NULL);
         break;
 
     case ai64:
-        IFDEBUG(12)
+        if (clink->jlink.debug)
             printf("   ai64 [%lld, ...]\n", clink->value.pintegers[0]);
         conv = dbFastPutConvertRoutine[DBF_INT64][dbrType];
         for (i = 0; i < nElems; i++) {
@@ -551,7 +496,7 @@ static long lnkConst_loadArray(struct link *plink, short dbrType, void *pbuffer,
         break;
 
     case af64:
-        IFDEBUG(12)
+        if (clink->jlink.debug)
             printf("   af64 [%g, ...]\n", clink->value.pdoubles[0]);
         conv = dbFastPutConvertRoutine[DBF_DOUBLE][dbrType];
         for (i = 0; i < nElems; i++) {
@@ -562,7 +507,7 @@ static long lnkConst_loadArray(struct link *plink, short dbrType, void *pbuffer,
         break;
 
     case ac40:
-        IFDEBUG(12)
+        if (clink->jlink.debug)
             printf("   ac40 ['%s', ...]\n", clink->value.pstrings[0]);
         conv = dbFastPutConvertRoutine[DBF_STRING][dbrType];
         for (i = 0; i < nElems; i++) {
@@ -573,7 +518,7 @@ static long lnkConst_loadArray(struct link *plink, short dbrType, void *pbuffer,
         break;
 
     default:
-        IFDEBUG(12)
+        if (clink->jlink.debug)
             printf("   Bad type %d\n", clink->type);
         status = S_db_badField;
     }
@@ -583,10 +528,6 @@ static long lnkConst_loadArray(struct link *plink, short dbrType, void *pbuffer,
 
 static long lnkConst_getNelements(const struct link *plink, long *nelements)
 {
-    IFDEBUG(10)
-        printf("lnkConst_getNelements(const@%p, (%ld))\n",
-            plink->value.json.jlink, *nelements);
-
     *nelements = 0;
     return 0;
 }
@@ -594,11 +535,6 @@ static long lnkConst_getNelements(const struct link *plink, long *nelements)
 static long lnkConst_getValue(struct link *plink, short dbrType, void *pbuffer,
         long *pnRequest)
 {
-    IFDEBUG(10)
-        printf("lnkConst_getValue(const@%p, %d, %p, ... (%ld))\n",
-            plink->value.json.jlink, dbrType, pbuffer,
-            pnRequest ? *pnRequest : 0);
-
     if (pnRequest)
         *pnRequest = 0;
     return 0;
diff --git a/src/std/link/lnkState.c b/src/std/link/lnkState.c
index 518a37029..b8791bd3b 100644
--- a/src/std/link/lnkState.c
+++ b/src/std/link/lnkState.c
@@ -35,11 +35,6 @@
 
 typedef long (*FASTCONVERT)();
 
-int lnkState_debug;
-epicsExportAddress(int, lnkState_debug);
-
-#define IFDEBUG(n) if (lnkState_debug >= (n))
-
 typedef struct state_link {
     jlink jlink;        /* embedded object */
     char *name;
@@ -57,9 +52,6 @@ static jlink* lnkState_alloc(short dbfType)
 {
     state_link *slink;
 
-    IFDEBUG(10)
-        printf("lnkState_alloc(%d)\n", dbfType);
-
     if (dbfType == DBF_FWDLINK) {
         errlogPrintf("lnkState: DBF_FWDLINK not supported\n");
         return NULL;
@@ -76,9 +68,6 @@ static jlink* lnkState_alloc(short dbfType)
     slink->invert = 0;
     slink->val = 0;
 
-    IFDEBUG(10)
-        printf("lnkState_alloc -> state@%p\n", slink);
-
     return &slink->jlink;
 }
 
@@ -86,9 +75,6 @@ static void lnkState_free(jlink *pjlink)
 {
     state_link *slink = CONTAINER(pjlink, struct state_link, jlink);
 
-    IFDEBUG(10)
-        printf("lnkState_free(state@%p)\n", slink);
-
     free(slink->name);
     free(slink);
 }
@@ -97,9 +83,6 @@ static jlif_result lnkState_string(jlink *pjlink, const char *val, size_t len)
 {
     state_link *slink = CONTAINER(pjlink, struct state_link, jlink);
 
-    IFDEBUG(10)
-        printf("lnkState_string(state@%p, \"%.*s\")\n", slink, (int) len, val);
-
     if (len > 1 && val[0] == '!') {
         slink->invert = 1;
         val++; len--;
@@ -111,9 +94,6 @@ static jlif_result lnkState_string(jlink *pjlink, const char *val, size_t len)
 
 static struct lset* lnkState_get_lset(const jlink *pjlink)
 {
-    IFDEBUG(10)
-        printf("lnkState_get_lset(state@%p)\n", pjlink);
-
     return &lnkState_lset;
 }
 
@@ -121,9 +101,6 @@ static void lnkState_report(const jlink *pjlink, int level, int indent)
 {
     state_link *slink = CONTAINER(pjlink, struct state_link, jlink);
 
-    IFDEBUG(10)
-        printf("lnkState_report(state@%p)\n", slink);
-
     printf("%*s'state': \"%s\" = %s%s\n", indent, "",
         slink->name, slink->invert ? "! " : "", slink->val ? "TRUE" : "FALSE");
 }
@@ -135,9 +112,6 @@ static void lnkState_open(struct link *plink)
     state_link *slink = CONTAINER(plink->value.json.jlink,
         struct state_link, jlink);
 
-    IFDEBUG(10)
-        printf("lnkState_open(state@%p)\n", slink);
-
     slink->state = dbStateCreate(slink->name);
 }
 
@@ -146,9 +120,6 @@ static void lnkState_remove(struct dbLocker *locker, struct link *plink)
     state_link *slink = CONTAINER(plink->value.json.jlink,
         struct state_link, jlink);
 
-    IFDEBUG(10)
-        printf("lnkState_remove(state@%p)\n", slink);
-
     free(slink->name);
     free(slink);
 
@@ -157,24 +128,11 @@ static void lnkState_remove(struct dbLocker *locker, struct link *plink)
 
 static int lnkState_getDBFtype(const struct link *plink)
 {
-    state_link *slink = CONTAINER(plink->value.json.jlink,
-        struct state_link, jlink);
-
-    IFDEBUG(10)
-        printf("lnkState_getDBFtype(state@%p)\n", slink);
-
     return DBF_SHORT;
 }
 
 static long lnkState_getElements(const struct link *plink, long *nelements)
 {
-    state_link *slink = CONTAINER(plink->value.json.jlink,
-        struct state_link, jlink);
-
-    IFDEBUG(10)
-        printf("lnkState_getElements(state@%p, (%ld))\n",
-            slink, *nelements);
-
     *nelements = 1;
     return 0;
 }
@@ -184,19 +142,10 @@ static long lnkState_getValue(struct link *plink, short dbrType, void *pbuffer,
 {
     state_link *slink = CONTAINER(plink->value.json.jlink,
         struct state_link, jlink);
-    long status;
-    short flag;
     FASTCONVERT conv = dbFastPutConvertRoutine[DBR_SHORT][dbrType];
 
-    IFDEBUG(10)
-        printf("lnkState_getValue(state@%p, %d, ...)\n",
-            slink, dbrType);
-
-    flag = dbStateGet(slink->state);
-    slink->val = slink->invert ^ flag;
-    status = conv(&slink->val, pbuffer, NULL);
-
-    return status;
+    slink->val = slink->invert ^ dbStateGet(slink->state);
+    return conv(&slink->val, pbuffer, NULL);
 }
 
 static long lnkState_putValue(struct link *plink, short dbrType,
@@ -207,10 +156,6 @@ static long lnkState_putValue(struct link *plink, short dbrType,
     short val;
     const char *pstr;
 
-    IFDEBUG(10)
-        printf("lnkState_putValue(state@%p, %d, ...)\n",
-            slink, dbrType);
-
     if (nRequest == 0)
         return 0;