significant simplifications of the interface

[libucw.git] / lib / conf2-test.c

diff --git a/lib/conf2-test.c b/lib/conf2-test.c
index 540ffed3dcfbe2de5baaf0394bed11075ecf61f0..8794bf7b14c439d1a3bff9222a15385cc066bc08 100644 (file)
--- a/lib/conf2-test.c
+++ b/lib/conf2-test.c
@@ -18,9 +18,8 @@ struct sub_sect_1 {
 };
 
 static byte *
-init_sec_1(void *ptr, struct cf_section *sec UNUSED)
+init_sec_1(struct sub_sect_1 *s)
 {
-  struct sub_sect_1 *s = ptr;
   s->name = "unknown";
   s->level = "default";
   s->confidence = 5;
@@ -28,75 +27,67 @@ init_sec_1(void *ptr, struct cf_section *sec UNUSED)
 }
 
 static byte *
-commit_sec_1(void *ptr, struct cf_section *sec UNUSED)
+commit_sec_1(struct sub_sect_1 *s)
 {
-  struct sub_sect_1 *s = ptr;
   if (s->confidence < 0 || s->confidence > 10)
     return "Well, this can't be";
   return NULL;
 }
 
 static struct cf_section cf_sec_1 = {
-  .size = sizeof(struct sub_sect_1),
-  .init = init_sec_1,
-  .commit = commit_sec_1,
-  .cfg = (struct cf_item[]) {
-#define F(x)   CF_FIELD(struct sub_sect_1, x)
-    CF_STRING("name", F(name)),
-    CF_STRING("level", F(level)),
-    CF_INT("confidence", F(confidence)),
-    CF_END
+  CF_TYPE(struct sub_sect_1)
+  CF_INIT(init_sec_1)
+  CF_COMMIT(commit_sec_1)
+#define F(x)   PTR_TO(struct sub_sect_1, x)
+  CF_ITEMS(
+    CF_STRING("name", F(name))
+    CF_STRING("level", F(level))
+    CF_INT("confidence", F(confidence))
+  )
 #undef F
-  }
 };
 
 static int nr1 = 15;
-static int *nrs1 = DEFAULT_ARRAY(int, 5, 5, 4, 3, 2, 1);
+static int *nrs1 = ARRAY_ALLOC(int, 5, 5, 4, 3, 2, 1);
 static int *nrs2;
 static byte *str1 = "no worries";
-static byte **str2 = DEFAULT_ARRAY(byte *, 2, "Alice", "Bob");
+static byte **str2 = ARRAY_ALLOC(byte *, 2, "Alice", "Bob");
 static u64 u1 = 0xCafeBeefDeadC00ll;
 static double d1 = -1.1;
-static struct sub_sect_1 sec_1 = { "Charlie", "WBAFC", 0 };
-static struct cnode secs;
+static struct sub_sect_1 sec1 = { "Charlie", "WBAFC", 0 };
+static struct clist secs;
 static time_t t1, t2;
 
 static byte *
-commit_top(void *ptr UNUSED, struct cf_section *sec UNUSED)
+commit_top(void *ptr UNUSED)
 {
+  if (nr1 != 15)
+    return "Don't touch my variable!";
   return NULL;
 }
 
 static byte *
-time_parser(uns nr_pars, byte **pars, void *sec_ptr, struct cf_section *sec, uns index)
+time_parser(uns number, byte **pars, time_t *ptr)
 {
-  if (nr_pars != 0 && nr_pars != 1)
-    return "Either now or 1 parameter!";
-  ASSERT(!sec_ptr);
-  time_t t = nr_pars ? atoi(pars[0]) : time(NULL);
-  if (sec->cfg[index].name[0] == 'F')
-    t1 = t;
-  else
-    t2 = t;
+  *ptr = number ? atoi(pars[0]) : time(NULL);
   return NULL;
 }
 
 static struct cf_section cf_top = {
-  .commit = commit_top,
-  .cfg = (struct cf_item []) {
-    CF_INT("nr1", &nr1),
-    CF_INT_AR("nrs1", &nrs1, 5),
-    CF_INT_AR("nrs2", &nrs2, -1000),
-    CF_STRING("str1", &str1),
-    CF_STRING_AR("str2", &str2, 2),
-    CF_U64("u1", &u1),
-    CF_DOUBLE("d1", &d1),
-    CF_FUNCTION("FirstTime", time_parser),
-    CF_FUNCTION("SecondTime", time_parser),
-    CF_SUB_SECTION("master", &sec_1, &cf_sec_1),
-    CF_LINK_LIST("slaves", &secs, &cf_sec_1),
-    CF_END
-  }
+  CF_COMMIT(commit_top)
+  CF_ITEMS(
+    CF_INT("nr1", &nr1)
+    CF_INT_ARY("nrs1", &nrs1, 5)
+    CF_INT_ARY("nrs2", &nrs2, -1000)
+    CF_STRING("str1", &str1)
+    CF_STRING_ARY("str2", &str2, 2)
+    CF_U64("u1", &u1)
+    CF_DOUBLE("d1", &d1)
+    CF_PARSER("FirstTime", &t1, time_parser, -1)
+    CF_PARSER("SecondTime", &t2, time_parser, 1)
+    CF_SECTION("master", &sec1, &cf_sec_1)
+    CF_LIST("slaves", &secs, &cf_sec_1)
+  )
 };
 
 int