X-Git-Url: http://mj.ucw.cz/gitweb/?a=blobdiff_plain;f=lib%2Fconf.h;h=7b86dc24f4c7a93e4a0e775de68ce4a0a2047828;hb=86919305a08aa88b3a60c3216752291ba7f0b496;hp=cb3e9e1d7d326520ae8642c5432b1212d838ab4a;hpb=9032f650148717ff68b03c55ecc4d466695c6e74;p=libucw.git

diff --git a/lib/conf.h b/lib/conf.h
index cb3e9e1d..7b86dc24 100644
--- a/lib/conf.h
+++ b/lib/conf.h
@@ -1,8 +1,8 @@
 /*
- *	Sherlock Library -- Reading of configuration files
+ *	UCW Library -- Reading of configuration files
  *
  *	(c) 2001 Robert Spalek <robert@ucw.cz>
- *	(c) 2003 Martin Mares <mj@ucw.cz>
+ *	(c) 2003--2005 Martin Mares <mj@ucw.cz>
  *
  *	This software may be freely distributed and used according to the terms
  *	of the GNU Lesser General Public License.
@@ -19,7 +19,9 @@
 
 extern struct mempool *cfpool;
 void *cfg_malloc(uns size);
-byte *cfg_stralloc(byte *s);
+void *cfg_malloc_zero(uns size);
+byte *cfg_strdup(byte *s);
+byte *cfg_printf(char *fmt, ...) FORMAT_CHECK(printf,1,2);
 
 /*
  * Every module places its configuration setting into some section.  Section is
@@ -63,6 +65,12 @@ byte *cf_parse_int(byte *value, uns *varp);
 byte *cf_parse_u64(byte *value, u64 *varp);
 byte *cf_parse_double(byte *value, double *varp);
 
+/* 
+ * Some useful parsing functions.
+ */
+
+byte *cf_parse_ip(byte **value, u32 *varp);
+
 /*
  * When using cf_getopt, you must prefix your own short/long options by the
  * CF_(SHORT|LONG)_OPTS.
@@ -80,9 +88,10 @@ byte *cf_parse_double(byte *value, double *varp);
 	{"set",		1, 0, 'S'},\
 	{"config",	1, 0, 'C'},
 #define CF_NO_LONG_OPTS (const struct option []){ CF_LONG_OPTS { NULL, 0, 0, 0 } }
+#define CF_USAGE_TAB ""
 #define	CF_USAGE	\
-"-S, --set sec.item=val\tManual setting of a configuration item\n\
--C, --config filename\tOverwrite default config filename\n"
+"-S, --set sec.item=val\t" CF_USAGE_TAB "Manual setting of a configuration item\n\
+-C, --config filename\t" CF_USAGE_TAB "Overwrite default config filename\n"
 
 extern byte *cfdeffile;