Use EPICS base definition for PV length.

Author: eddybl

asApp/src/save_restore.h

@@ -1,5 +1,6 @@
 /* save_restore.h */
 
+#include <dbDefs.h> /* PVNAME_STRINGSZ for PV length*/
 #include <ellLib.h> /* pass0List, pass1List */
 #include <initHooks.h>
 #include "save_restore_common.h"
@@ -51,7 +52,9 @@
 #define FN_LEN 80                  /* filename length */
 #define STRING_LEN MAX_STRING_SIZE /* EPICS max length for string PV */
 #define STATUS_STR_LEN 300
-#define PV_NAME_LEN 80 /* string containing a PV name */
+/* PV_NAME_LENGTH was historcially at least 80, so we ensure it is at least that and otherwise use
+PVNAME_STRINGSZ from EPICS base dbDefs.h */
+#define PV_NAME_LEN ((PVNAME_STRINGSZ > 80) ? (PVNAME_STRINGSZ) : (80)) /* string containing a PV name */
 #define MAXSTRING 300
 
 struct restoreFileListItem {

asApp/src/verify.c

@@ -17,9 +17,6 @@
 
 #include "save_restore.h"
 
-#ifndef PVNAME_STRINGSZ
-#define PVNAME_STRINGSZ 61 /* includes terminating null */
-#endif
 #define PEND_TIME 5.0
 
 #define FSMALL 1.e-6
@@ -143,7 +140,7 @@ int do_asVerify_fp(FILE *fp, int verbose, int debug, int write_restore_file, cha
         if (debug > 3)
             printf("\nasVerify: PVname='%s', value_string[%d]='%s'\n", PVname, (int)strlen(value_string), value_string);
         if (n < 2) *value_string = 0;
-        if (strlen(PVname) >= PVNAME_STRINGSZ) {
+        if (strlen(PVname) >= PV_NAME_LEN) {
             /* Impossible PV name */
             if (write_restore_file) fprintf(fr, "#? %s", bp);
             continue;