From 21a94ef352da202258b32a58523488e451e1bf1d Mon Sep 17 00:00:00 2001 From: gombasg Date: Fri, 19 May 2006 13:00:11 +0000 Subject: [PATCH] Move the definitions of common configuration keys to dc_internal.h git-svn-id: svn+ssh://cvs.lpds.sztaki.hu/var/lib/svn/szdg/dcapi/trunk@570 a7169a2c-3604-0410-bc95-c702d8d87f7a --- dcapi/boinc/dc_boinc.h | 4 ---- dcapi/condor/condor_defs.h | 2 -- dcapi/include/dc_internal.h | 16 +++++++++++++++- dcapi/local/dc_local.h | 4 +--- 4 files changed, 16 insertions(+), 10 deletions(-) diff --git a/dcapi/boinc/dc_boinc.h b/dcapi/boinc/dc_boinc.h index 5ae8f5c47b..ac0d68aaa5 100644 --- a/dcapi/boinc/dc_boinc.h +++ b/dcapi/boinc/dc_boinc.h @@ -24,10 +24,6 @@ extern "C" { * Constants */ -/* Master's working directory (absolute path) */ -#define CFG_WORKDIR "WorkingDirectory" -/* Application instance UUID */ -#define CFG_INSTANCEUUID "InstanceUUID" /* Location of config.xml */ #define CFG_CONFIGXML "BoincConfigXML" /* The root direcory of the BOINC project */ diff --git a/dcapi/condor/condor_defs.h b/dcapi/condor/condor_defs.h index 70a3c724a3..72650b6b40 100644 --- a/dcapi/condor/condor_defs.h +++ b/dcapi/condor/condor_defs.h @@ -49,8 +49,6 @@ typedef enum FILE_DCAPI } WorkdirFile; -#define CFG_WORKDIR "WorkingDirectory" - #ifdef __cplusplus } diff --git a/dcapi/include/dc_internal.h b/dcapi/include/dc_internal.h index e5d19b77e9..91e27a0f9e 100644 --- a/dcapi/include/dc_internal.h +++ b/dcapi/include/dc_internal.h @@ -9,7 +9,7 @@ * Copyright MTA SZTAKI, 2006 */ -/* */ +/* */ #ifndef __DC_INTERNAL_H_ #define __DC_INTERNAL_H_ @@ -18,6 +18,20 @@ extern "C" { #endif +/******************************************************************** + * Constants + */ + +/* Master's working directory (absolute path) */ +#define CFG_WORKDIR "WorkingDirectory" +/* Application instance UUID */ +#define CFG_INSTANCEUUID "InstanceUUID" +/* Log level */ +#define CFG_LOGLEVEL "LogLevel" +/* Log file location */ +#define CFG_LOGFILE "LogFile" + + /******************************************************************** * Function prototypes */ diff --git a/dcapi/local/dc_local.h b/dcapi/local/dc_local.h index b29d5227d4..40f0f011f7 100644 --- a/dcapi/local/dc_local.h +++ b/dcapi/local/dc_local.h @@ -17,11 +17,9 @@ extern "C" { */ /* DCAPI configuration keys */ -#define CFG_WORKDIR "WorkingDirectory" #define CFG_SLEEPINTERVAL "SleepingInterval" -#define CFG_INSTANCEUUID "InstanceUUID" -#define DEFAULT_SLEEP_INTERVAL 5 +#define DEFAULT_SLEEP_INTERVAL 5 /* File types in the working directory */ typedef enum