From 5862470eafc2f217892fb3a9d7d208aaa5ece303 Mon Sep 17 00:00:00 2001 From: Martin Mares Date: Sat, 28 Apr 2012 18:50:04 +0200 Subject: [PATCH] Conf: Obsolete references to cf_def_file --- ucw/conf-test.c | 2 +- ucw/doc/conf.txt | 2 +- ucw/mempool.c | 2 +- ucw/redblack-test.c | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/ucw/conf-test.c b/ucw/conf-test.c index 34d1f36b..29653f53 100644 --- 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 31698a62..37f2a294 100644 --- 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 521724a8..e8e30e46 100644 --- 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 191473db..911f8250 100644 --- 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) -- 2.39.2