X-Git-Url: http://mj.ucw.cz/gitweb/?a=blobdiff_plain;f=ucw%2Fconf-internal.h;h=67a96cf5baece5563bf866c68a57d265fcd33467;hb=1b2faf7409371da71c440704e3a75c34f7a9d750;hp=bab5383740ec4f7f01d493532ec677007669e744;hpb=8c23d507cbb0af5452d6d4e16b1750adfbb7d28d;p=libucw.git

diff --git a/ucw/conf-internal.h b/ucw/conf-internal.h
index bab53837..67a96cf5 100644
--- a/ucw/conf-internal.h
+++ b/ucw/conf-internal.h
@@ -42,15 +42,15 @@ struct dirty_section {
 struct cf_context {
   struct mempool *pool;
   int is_active;
-  int def_loaded;
+  int config_loaded;			// at least one config file was loaded
   struct cf_parser_state *parser;
-  uns everything_committed;		// after the 1st load, this flag is set on
-  uns postpone_commit;			// used internally by cf_getopt()
-  uns other_options;
+  uns everything_committed;		// did we already commit each section?
+  uns postpone_commit;			// counter of calls to cf_open_group()
+  uns other_options;			// used internally by cf_getopt()
   clist conf_entries;			// files/strings to reload
+  struct cf_journal_item *journal;	// journalling
+  int enable_journal;
   struct old_pools *pools;
-  struct cf_journal_item *journal;
-  int need_journal;
   struct item_stack stack[MAX_STACK_SIZE];	// interpreter stack
   uns stack_level;
   struct cf_section sections;		// root section
@@ -85,7 +85,7 @@ extern char *cf_type_names[];
 uns cf_type_size(enum cf_type type, struct cf_user_type *utype);
 char *cf_interpret_line(struct cf_context *cc, char *name, enum cf_operation op, int number, char **pars);
 void cf_init_stack(struct cf_context *cc);
-int cf_check_stack(struct cf_context *cc);
+int cf_done_stack(struct cf_context *cc);
 
 /* conf-journal.c */
 void cf_journal_swap(void);