From 05192271f5487d20361687b9e620093ff56dc2c6 Mon Sep 17 00:00:00 2001
From: Simon Rose <simon.rose@ess.eu>
Date: Thu, 11 May 2023 13:39:58 +0200
Subject: [PATCH] Remove superfluous dbd location checks
---
require-ess/src/require.c | 13 +------------
1 file changed, 1 insertion(+), 12 deletions(-)
diff --git a/require-ess/src/require.c b/require-ess/src/require.c
index 3fb3855f..26f9641e 100644
--- a/require-ess/src/require.c
+++ b/require-ess/src/require.c
@@ -1125,18 +1125,7 @@ static int require_priv(const char *module, const char *version) {
/* load dbd file */
if (TRY_NONEMPTY_FILE(releasediroffs, "dbd" OSI_PATH_SEPARATOR "%s.dbd",
- module) ||
- TRY_NONEMPTY_FILE(releasediroffs, "%s.dbd", module) ||
- TRY_NONEMPTY_FILE(releasediroffs,
- ".." OSI_PATH_SEPARATOR "dbd" OSI_PATH_SEPARATOR
- "%s.dbd",
- module) ||
- TRY_NONEMPTY_FILE(releasediroffs, ".." OSI_PATH_SEPARATOR "%s.dbd",
- module) ||
- TRY_NONEMPTY_FILE(releasediroffs,
- ".." OSI_PATH_SEPARATOR ".." OSI_PATH_SEPARATOR
- "dbd" OSI_PATH_SEPARATOR "%s.dbd",
- module)) /* org EPICSbase */ {
+ module)) {
printf("Loading dbd file %s\n", filename);
if (dbLoadDatabase(filename, NULL, NULL) != 0) {
fprintf(stderr, "Error loading %s\n", filename);
--
GitLab