From c2ec5f9a8cdfc4e60c1ba94254436a0949818218 Mon Sep 17 00:00:00 2001
From: Simon Rose <simon.rose@ess.eu>
Date: Thu, 11 May 2023 13:27:27 +0200
Subject: [PATCH] Minor cleanup
---
require-ess/src/require.c | 24 ++++++------------------
1 file changed, 6 insertions(+), 18 deletions(-)
diff --git a/require-ess/src/require.c b/require-ess/src/require.c
index 9bd16663..3fb3855f 100644
--- a/require-ess/src/require.c
+++ b/require-ess/src/require.c
@@ -1079,12 +1079,12 @@ static int require_priv(const char *module, const char *version) {
"%n%s.dep",
founddir, &releasediroffs, targetArch, &libdiroffs, module)) {
/* filename =
- "<dirname>/[dirlen]<module>/<version>/R<epicsRelease>/[releasediroffs]/lib/<targetArch>/[libdiroffs]/module.dep"
+ "<dirname>/[dirlen]<module>/<version>/[releasediroffs]/lib/<targetArch>/[libdiroffs]/module.dep"
*/
fprintf(stderr, "Dependency file %s not found\n", filename);
} else {
/* filename =
- * "<dirname>/[dirlen]<module>/<version>/R<epicsRelease>/[releasediroffs]/lib/<targetArch>/[libdiroffs]/module.dep"
+ * "<dirname>/[dirlen]<module>/<version>/[releasediroffs]/lib/<targetArch>/[libdiroffs]/module.dep"
*/
if (handleDependencies(module, filename) == -1) return -1;
}
@@ -1093,12 +1093,12 @@ static int require_priv(const char *module, const char *version) {
if (!(TRY_FILE(libdiroffs, PREFIX "%s" INFIX "%n" EXT, module, &extoffs))) {
/* filename =
- "<dirname>/[dirlen]<module>/<version>/R<epicsRelease>/[releasediroffs]/lib/<targetArch>/[libdiroffs]/PREFIX<module>INFIX[extoffs](EXT)?"
+ "<dirname>/[dirlen]<module>/<version>/[releasediroffs]/lib/<targetArch>/[libdiroffs]/PREFIX<module>INFIX[extoffs](EXT)?"
*/
printf("Module %s has no library\n", module);
} else {
/* filename =
- * "<dirname>/[dirlen]<module>/<version>/R<epicsRelease>/[releasediroffs]/lib/<targetArch>/[libdiroffs]/PREFIX<module>INFIX[extoffs]EXT"
+ * "<dirname>/[dirlen]<module>/<version>/[releasediroffs]/lib/<targetArch>/[libdiroffs]/PREFIX<module>INFIX[extoffs]EXT"
*/
printf("Loading library %s\n", filename);
if ((libhandle = loadlib(filename)) == NULL) return -1;
@@ -1161,14 +1161,11 @@ static int require_priv(const char *module, const char *version) {
registerModule(module, found, filename);
}
- status = 0;
-
if (requireDebug) printf("require: looking for template directory\n");
/* filename =
- * "<dirname>/[dirlen]<module>/<version>/R<epicsRelease>/[releasediroffs]..."
+ * "<dirname>/[dirlen]<module>/<version>/[releasediroffs]..."
*/
- if (!((TRY_FILE(releasediroffs, TEMPLATEDIR) ||
- TRY_FILE(releasediroffs, ".." OSI_PATH_SEPARATOR TEMPLATEDIR)) &&
+ if (!(TRY_FILE(releasediroffs, TEMPLATEDIR) &&
setupDbPath(module, filename) == 0)) {
/* if no template directory found, restore TEMPLATES to initial value */
char *t;
@@ -1177,15 +1174,6 @@ static int require_priv(const char *module, const char *version) {
putenvprintf("TEMPLATES=%s", globalTemplates);
}
- if (founddir) free(founddir);
-
- /* no need to execute startup script twice if not with new arguments */
- if (loaded) {
- return 0;
- }
-
- return status;
-
require_priv_error:
if (founddir) free(founddir);
return returnvalue;
--
GitLab