Merge with git+ssh://git.ucw.cz/projects/sherlock/GIT/sherlock.git

[libucw.git] / lib / getopt.h

diff --git a/lib/getopt.h b/lib/getopt.h
index 6f29af8a182607990bf41d59275a074d7fdcf2b4..b4ff823ffb4f43bb9087535d79a5f658dc330a53 100644 (file)
--- a/lib/getopt.h
+++ b/lib/getopt.h
@@ -21,10 +21,11 @@ void reset_getopt(void);
 
 /* Safe loading and reloading of configuration files: conf-input.c */
 
 
 /* Safe loading and reloading of configuration files: conf-input.c */
 

-extern byte *cf_def_file;              /* DEFAULT_CONFIG; NULL if already loaded */
-int cf_reload(byte *file);
-int cf_load(byte *file);
-int cf_set(byte *string);
+extern char *cf_def_file;              /* DEFAULT_CONFIG; NULL if already loaded */
+extern char *cf_env_file;              /* ENV_VAR_CONFIG */
+int cf_reload(const char *file);
+int cf_load(const char *file);
+int cf_set(const char *string);

 
 /* Direct access to configuration items: conf-intr.c */
 
 
 /* Direct access to configuration items: conf-intr.c */
 


@@ -40,8 +41,8 @@ enum cf_operation { CF_OPERATIONS };
 #undef T
 
 struct cf_item;
 #undef T
 
 struct cf_item;

-byte *cf_find_item(byte *name, struct cf_item *item);
-byte *cf_write_item(struct cf_item *item, enum cf_operation op, int number, byte **pars);
+char *cf_find_item(const char *name, struct cf_item *item);
+char *cf_write_item(struct cf_item *item, enum cf_operation op, int number, char **pars);

 
 /* Debug dumping: conf-dump.c */
 
 
 /* Debug dumping: conf-dump.c */