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

[libucw.git] / lib / conf-internal.h

diff --git a/lib/conf-internal.h b/lib/conf-internal.h
index fbcdc03cbd2c572e2d54a4f8579dc652e8128289..377a9cb235a1ab63e8815a787610a43892fa1f9c 100644 (file)
--- a/lib/conf-internal.h
+++ b/lib/conf-internal.h
@@ -1,13 +1,27 @@
+/*
+ *     UCW Library -- Configuration files: only for internal use of conf-*.c
+ *
+ *     (c) 2001--2006 Robert Spalek <robert@ucw.cz>
+ *     (c) 2003--2006 Martin Mares <mj@ucw.cz>
+ *
+ *     This software may be freely distributed and used according to the terms
+ *     of the GNU Lesser General Public License.
+ */
+
+#ifndef        _UCW_CONF_INTERNAL_H
+#define        _UCW_CONF_INTERNAL_H
+
 /* conf-intr.c */
 #define OP_MASK 0xff           // only get the operation
 #define OP_OPEN 0x100          // here we only get an opening brace instead of parameters
 #define OP_1ST 0x200           // in the 1st phase selectors are recorded into the mask
 #define OP_2ND 0x400           // in the 2nd phase real data are entered
 enum cf_operation;
-extern byte *cf_op_names[];
+extern char *cf_op_names[];
+extern char *cf_type_names[];
 
 uns cf_type_size(enum cf_type type, struct cf_user_type *utype);
-byte *cf_interpret_line(byte *name, enum cf_operation op, int number, byte **pars);
+char *cf_interpret_line(char *name, enum cf_operation op, int number, char **pars);
 void cf_init_stack(void);
 int cf_check_stack(void);
 
@@ -23,6 +37,8 @@ void cf_journal_delete(void);
 enum cf_commit_mode { CF_NO_COMMIT, CF_COMMIT, CF_COMMIT_ALL };
 extern struct cf_section cf_sections;
 
-struct cf_item *cf_find_subitem(struct cf_section *sec, byte *name);
+struct cf_item *cf_find_subitem(struct cf_section *sec, const char *name);
 int cf_commit_all(enum cf_commit_mode cm);
 void cf_add_dirty(struct cf_section *sec, void *ptr);
+
+#endif