Merge branch 'more-cleanup' into 'master'

More cleanup

See merge request e3/e3-require!112

require-ess/src/require.c

 /* Copyright (C) 2020 Dirk Zimoch */
 /* Copyright (C) 2020-2022 European Spallation Source, ERIC */
 
-/*
- * ld - load code dynamically
- *
- * $Author: zimoch $
- * $ID$
- * $Date: 2015/06/29 09:47:30 $
- *
- * DISCLAIMER: Use at your own risc and so on. No warranty, no refund.
- */
-
 #ifdef __unix
 /* for vasprintf and dl_iterate_phdr */
 #ifndef _GNU_SOURCE
@@ -107,16 +97,6 @@ int requireDebug;
 #define LIBDIR "lib" OSI_PATH_SEPARATOR
 #define TEMPLATEDIR "db"
 
-// #define TOSTR(s) TOSTR2(s)
-// #define TOSTR2(s) #s
-// const char epicsRelease[] =
-// TOSTR(EPICS_VERSION)"."TOSTR(EPICS_REVISION)"."TOSTR(EPICS_MODIFICATION);
-
-// #ifndef T_A
-// #error T_A not defined: Compile with USR_CFLAGS += -DT_A='"${T_A}"'
-// #endif
-// const char targetArch[] = T_A;
-
 #ifndef OS_CLASS
 #error OS_CLASS not defined: Try to compile with USR_CFLAGS += -DOS_CLASS='"${OS_CLASS}"'
 #endif  // OS_CLASS
@@ -289,10 +269,6 @@ static int setupDbPath(const char *module, const char *dbdir) {
 
 static int getRecordHandle(const char *namepart, short type, long minsize,
                            DBADDR *paddr) {
-  /*
-  #define PVNAME_STRINGSZ 61
-  defined in EPICS_BASE/include/dbDefs.h
- */
   char recordname[PVNAME_STRINGSZ] = "";
   long dummy = 0L;
   long offset = 0L;
@@ -897,18 +873,6 @@ static int handleDependencies(const char *module, char *depfilename) {
       end = rversion;
       /* find end of version */
       while (*end && !isspace((unsigned char)*end)) end++;
-
-      /* add + to numerial versions if not yet there */
-      /*
-    ESS would like to use the MATCH version only, not HIGHER.
-    In order to touch the PSI code mininaly, disable add + from VERSION from Dep
-    file. At the same time, ESS use the X.X.X instead of X.X. Wednesday, May  2
-    00:12:18 CEST 2018, jhlee
-  */
-      /*
-  if (*(end-1) != '+' && strspn(rversion, "0123456789.") ==
-  (size_t)(end-rversion)) *end++ = '+';
-*/
       /* terminate version */
       *end = 0;
     }