replaced several "byte *" -> "char *", mostly in the configuration system

[libucw.git] / lib / getopt.h

diff --git a/lib/getopt.h b/lib/getopt.h
index 042a1b05eaec65407fa563a3a14b6420c33bf152..c6383ea741974490dcf3ac69f498a17ddc69a120 100644 (file)
--- a/lib/getopt.h
+++ b/lib/getopt.h
@@ -11,18 +11,24 @@
 #ifndef        _UCW_GETOPT_H
 #define        _UCW_GETOPT_H
 
+#ifdef CONFIG_OWN_GETOPT
+#include "lib/getopt/getopt-sh.h"
+#else
 #include <getopt.h>
+#endif
+
+void reset_getopt(void);
 
 /* 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 */
+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 */
 
-#define CF_OPERATIONS T(CLOSE) T(SET) T(CLEAR) T(UNSET) T(ALL) \
+#define CF_OPERATIONS T(CLOSE) T(SET) T(CLEAR) T(ALL) \
   T(APPEND) T(PREPEND) T(REMOVE) T(EDIT) T(AFTER) T(BEFORE) T(COPY)
   /* Closing brace finishes previous block.
    * Basic attributes (static, dynamic, parsed) can be used with SET.
@@ -34,8 +40,8 @@ enum cf_operation { CF_OPERATIONS };
 #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 */