From 62401b844c4671630affe5526b7e7f8326a38a99 Mon Sep 17 00:00:00 2001
From: Sebastien Ponce <sponcec3@cern.ch>
Date: Fri, 4 Jun 2010 15:01:11 +0000
Subject: [PATCH] Cleaned up lot's of non compiled code inside old macros
---
mediachanger/castorrmc/common/getconfent.c | 15 +--------------
1 file changed, 1 insertion(+), 14 deletions(-)
diff --git a/mediachanger/castorrmc/common/getconfent.c b/mediachanger/castorrmc/common/getconfent.c
index 0096f0b716..19859f746f 100644
--- a/mediachanger/castorrmc/common/getconfent.c
+++ b/mediachanger/castorrmc/common/getconfent.c
@@ -13,11 +13,7 @@
#include "Castor_limits.h"
#ifndef PATH_CONFIG
-#if defined(_WIN32)
-#define PATH_CONFIG "%SystemRoot%\\system32\\drivers\\etc\\castor\\castor.conf"
-#else
#define PATH_CONFIG "/etc/castor/castor.conf"
-#endif
#endif /* PATH_CONFIG */
#if ((defined(_REENTRANT) || defined(_THREAD_SAFE)) && !defined(_WIN32))
@@ -54,16 +50,7 @@ static char *getconfent_r(filename,category, name, flags, buffer, bufsiz)
}
}
-#if defined(_WIN32)
- if (strncmp (filename, "%SystemRoot%\\", 13) == 0 &&
- (p = getenv ("SystemRoot"))) {
- Csnprintf (path_config, CA_MAXPATHLEN, "%s\\%s", p, strchr (filename, '\\'));
- } else {
-#endif
- strncpy (path_config, filename, CA_MAXPATHLEN);
-#if defined(_WIN32)
- }
-#endif
+ strncpy (path_config, filename, CA_MAXPATHLEN);
/* Who knows */
path_config[CA_MAXPATHLEN] = '\0';
--
GitLab