MD5: The rest of the test suite

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

diff --git a/ucw/conf-internal.h b/ucw/conf-internal.h
index ee6d08d4d80c35a0b7ffbaae664094574f6a86ba..67a96cf5baece5563bf866c68a57d265fcd33467 100644 (file)
--- a/ucw/conf-internal.h
+++ b/ucw/conf-internal.h
@@ -44,13 +44,13 @@ struct cf_context {
   int is_active;
   int config_loaded;                   // at least one config file was loaded
   struct cf_parser_state *parser;
   int is_active;
   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
   clist conf_entries;                  // files/strings to reload

+  struct cf_journal_item *journal;     // journalling
+  int enable_journal;

   struct old_pools *pools;
   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
   struct item_stack stack[MAX_STACK_SIZE];     // interpreter stack
   uns stack_level;
   struct cf_section sections;          // root section