Conf: DEFAULT_CONFIG and ENV_VAR_CONFIG got a CONFIG_UCW_ prefix

diff --git a/ucw/conf-input.c b/ucw/conf-input.c
index fffc6d57e5cd5d8088755bb9c0730768c63cc421..ad8bfc8e26c1c440b6c2a1800cd44f5ebf7cf185 100644 (file)
--- a/ucw/conf-input.c
+++ b/ucw/conf-input.c
@@ -281,16 +281,16 @@ error:
   return "included from here";
 }
 
-#ifndef DEFAULT_CONFIG
-#define DEFAULT_CONFIG NULL
+#ifndef CONFIG_UCW_DEFAULT_CONFIG
+#define CONFIG_UCW_DEFAULT_CONFIG NULL
 #endif
-char *cf_def_file = DEFAULT_CONFIG;
+char *cf_def_file = CONFIG_UCW_DEFAULT_CONFIG;
 static int cf_def_loaded;
 
-#ifndef ENV_VAR_CONFIG
-#define ENV_VAR_CONFIG NULL
+#ifndef CONFIG_UCW_ENV_VAR_CONFIG
+#define CONFIG_UCW_ENV_VAR_CONFIG NULL
 #endif
-char *cf_env_file = ENV_VAR_CONFIG;
+char *cf_env_file = CONFIG_UCW_ENV_VAR_CONFIG;
 
 static uns postpone_commit;                    // only for cf_getopt()
 static uns everything_committed;               // after the 1st load, this flag is set on

diff --git a/ucw/default.cfg b/ucw/default.cfg
index 91e0289e4457a4ada01035fa7b251aa719c34697..778cbaab2b0267b69aabcc618dfa059008eb9f63 100644 (file)
--- a/ucw/default.cfg
+++ b/ucw/default.cfg
@@ -44,10 +44,10 @@ Set("CONFIG_UCW_SHELL_UTILS" => 1);
 Set("CONFIG_UCW_UTILS" => 1);
 
 # Default configuration file
-UnSet("DEFAULT_CONFIG");
+UnSet("CONFIG_UCW_DEFAULT_CONFIG");
 
 # Environment variable with configuration file
-UnSet("ENV_VAR_CONFIG");
+UnSet("CONFIG_UCW_ENV_VAR_CONFIG");
 
 # Allow use of direct IO on files
 Set("CONFIG_DIRECT_IO");

diff --git a/ucw/getopt.h b/ucw/getopt.h
index 5fe66cead34d435eb0d67a2d1044052f51d2e631..eb350012374f198bc2e50eeb2439a1e2cafc7cc4 100644 (file)
--- a/ucw/getopt.h
+++ b/ucw/getopt.h
@@ -28,13 +28,13 @@ void reset_getopt(void);    /** If you want to start parsing of the arguments from
  */
 
 /**
- * The default config (DEFAULT_CONFIG config option) or NULL if already loaded.
+ * The default config (as set by `CONFIG_UCW_DEFAULT_CONFIG`) or NULL if already loaded.
  * You can set it to something else manually.
  */
 extern char *cf_def_file;
 /**
- * Name of environment variable that can override what configuration
- * is loaded.
+ * Name of environment variable that can override what configuration is loaded.
+ * Defaults to `CONFIG_UCW_ENV_VAR_CONFIG`.
  **/
 extern char *cf_env_file;
 int cf_reload(const char *file);       /** Reload configuration from @file, replace the old one. **/