Conf: Obsolete references to cf_def_file

diff --git a/ucw/conf-test.c b/ucw/conf-test.c
index 34d1f36bc9e316350bd8d2eab7194423037144c8..29653f5338f04553385ae2cc8d244dcfe0b0739d 100644 (file)
--- a/ucw/conf-test.c
+++ b/ucw/conf-test.c
@@ -193,7 +193,7 @@ main(int argc, char *argv[])
 {
   log_init(argv[0]);
   cf_declare_section("top", &cf_top, 0);
-  cf_def_file = "ucw/conf-test.cf";
+  cf_set_default_file("ucw/conf-test.cf");
 
   int opt;
   while ((opt = cf_getopt(argc, argv, short_opts, long_opts, NULL)) >= 0)

diff --git a/ucw/doc/conf.txt b/ucw/doc/conf.txt
index 31698a62b9d6f4fafb8ad78a6c6b1c535844356d..37f2a294daa03aca73551ea8c92a416e50ae57ba 100644 (file)
--- a/ucw/doc/conf.txt
+++ b/ucw/doc/conf.txt
@@ -114,7 +114,7 @@ configuration files.
   static int verbose;
 
   int main(int argc, char *argv[]) {
-    cf_def_file = "default.cf";
+    cf_set_default_file("default.cf");
     int opt;
     while((opt = cf_getopt(argc, argv, short_opts, long_opts, NULL)) >= 0)
       switch(opt) {

diff --git a/ucw/mempool.c b/ucw/mempool.c
index 521724a8b582accde6f68a649f793c0d5c05e6ba..e8e30e46f3cd38930f32548e27b351fc1b44f60f 100644 (file)
--- a/ucw/mempool.c
+++ b/ucw/mempool.c
@@ -374,7 +374,7 @@ int main(int argc, char **argv)
 {
   srand(time(NULL));
   log_init(argv[0]);
-  cf_def_file = NULL;
+  cf_set_default_file(NULL);
   if (cf_getopt(argc, argv, CF_SHORT_OPTS, CF_NO_LONG_OPTS, NULL) >= 0 || argc != optind)
     die("Invalid usage");
 

diff --git a/ucw/redblack-test.c b/ucw/redblack-test.c
index 191473db85542efe53a8842345c4f7cfc31f3e89..911f8250a76ec2343bb8b3bfc02b4400322b7c40 100644 (file)
--- a/ucw/redblack-test.c
+++ b/ucw/redblack-test.c
@@ -127,7 +127,7 @@ main(int argc, char **argv)
        struct my_tree t;
        struct my2_tree t2;
        int i;
-       cf_def_file = NULL;
+       cf_set_default_file(NULL);
        log_init(argv[0]);
        while ((opt = cf_getopt(argc, argv, options, CF_NO_LONG_OPTS, NULL)) >= 0)
                switch (opt)