From ced9a00682e8dfc081817dffc8afc2c80bcd2ab8 Mon Sep 17 00:00:00 2001 From: Michal Vaner Date: Wed, 22 Oct 2008 14:03:42 +0200 Subject: [PATCH] ucw docs: tweaks in conf.html --- ucw/conf.h | 6 +++--- ucw/getopt.h | 8 ++++++-- 2 files changed, 9 insertions(+), 5 deletions(-) diff --git a/ucw/conf.h b/ucw/conf.h index dc1d1454..7b324519 100644 --- a/ucw/conf.h +++ b/ucw/conf.h @@ -277,17 +277,17 @@ struct cf_section { /** A section. **/ **/ #define CF_LOOKUP_DYN(n,p,t,c) { .cls = CC_DYNAMIC, .type = CT_LOOKUP, .name = n, .number = c, .ptr = CHECK_PTR_TYPE(p,int**), .u.lookup = t } /** - * A user defined type. + * A user-defined type. * See <> section if you want to know more. **/ #define CF_USER(n,p,t) { .cls = CC_STATIC, .type = CT_USER, .name = n, .number = 1, .ptr = p, .u.utype = t } /** - * Static array of user defined types (all of the same type). + * Static array of user-defined types (all of the same type). * See <> section. **/ #define CF_USER_ARY(n,p,t,c) { .cls = CC_STATIC, .type = CT_USER, .name = n, .number = c, .ptr = p, .u.utype = t } /** - * Dynamic array of user defined types. + * Dynamic array of user-defined types. * See <> section. **/ #define CF_USER_DYN(n,p,t,c) { .cls = CC_DYNAMIC, .type = CT_USER, .name = n, .number = c, .ptr = p, .u.utype = t } diff --git a/ucw/getopt.h b/ucw/getopt.h index 3a559247..453d382e 100644 --- a/ucw/getopt.h +++ b/ucw/getopt.h @@ -31,8 +31,12 @@ 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. * You can set it to something else manually. */ -extern char *cf_def_file; /* DEFAULT_CONFIG; NULL if already loaded */ -extern char *cf_env_file; /** ENV_VAR_CONFIG **/ +extern char *cf_def_file; +/** + * Name of environment variable that can override what configuration + * is loaded. + **/ +extern char *cf_env_file; int cf_reload(const char *file); /** Reload configuration from @file, replace the old one. **/ int cf_load(const char *file); /** Load configuration from @file. **/ /** -- 2.39.2