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

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

diff --git a/lib/conf-test.c b/lib/conf-test.c
index 0a4209daf1a3a57403e014dd2ac5d049ef47291b..61ba4bc9edfe3f5381080f71c9066bdb7031aa86 100644 (file)
--- a/lib/conf-test.c
+++ b/lib/conf-test.c
@@ -18,22 +18,20 @@ static int verbose;
 
 struct sub_sect_1 {
   cnode n;
 
 struct sub_sect_1 {
   cnode n;

-  byte *name;
+  char *name;

   time_t t;
   time_t t;

-  byte *level;
+  char *level;

   int confidence[2];
   double *list;
 };
 
 static struct sub_sect_1 sec1 = { {}, "Charlie", 0, "WBAFC", { 0, -1}, DARY_ALLOC(double, 3, 1e4, -1e-4, 8) };
 
   int confidence[2];
   double *list;
 };
 
 static struct sub_sect_1 sec1 = { {}, "Charlie", 0, "WBAFC", { 0, -1}, DARY_ALLOC(double, 3, 1e4, -1e-4, 8) };
 

-static byte *
+static char *

 init_sec_1(struct sub_sect_1 *s)
 {
 init_sec_1(struct sub_sect_1 *s)
 {

-  if (s == &sec1) {                    // this is a static variable; skip clearing
-    DARY_LEN(sec1.list) = 3;           // XXX: fix for the bug in DARY_ALLOC()
+  if (s == &sec1)                      // this is a static variable; skip clearing

     return NULL;
     return NULL;

-  }

   s->name = "unknown";
   s->level = "default";
   s->confidence[0] = 5;
   s->name = "unknown";
   s->level = "default";
   s->confidence[0] = 5;


@@ -42,7 +40,7 @@ init_sec_1(struct sub_sect_1 *s)
   return NULL;
 }
 
   return NULL;
 }
 

-static byte *
+static char *

 commit_sec_1(struct sub_sect_1 *s)
 {
   if (s->confidence[0] < 0 || s->confidence[0] > 10)
 commit_sec_1(struct sub_sect_1 *s)
 {
   if (s->confidence[0] < 0 || s->confidence[0] > 10)


@@ -50,8 +48,8 @@ commit_sec_1(struct sub_sect_1 *s)
   return NULL;
 }
 
   return NULL;
 }
 

-static byte *
-time_parser(uns number, byte **pars, time_t *ptr)
+static char *
+time_parser(uns number, char **pars, time_t *ptr)

 {
   *ptr = number ? atoi(pars[0]) : time(NULL);
   return NULL;
 {
   *ptr = number ? atoi(pars[0]) : time(NULL);
   return NULL;


@@ -76,8 +74,8 @@ static struct cf_section cf_sec_1 = {
 static uns nr1 = 15;
 static int *nrs1 = DARY_ALLOC(int, 5, 5, 4, 3, 2, 1);
 static int nrs2[5];
 static uns nr1 = 15;
 static int *nrs1 = DARY_ALLOC(int, 5, 5, 4, 3, 2, 1);
 static int nrs2[5];

-static byte *str1 = "no worries";
-static byte **str2 = DARY_ALLOC(byte *, 2, "Alice", "Bob");
+static char *str1 = "no worries";
+static char **str2 = DARY_ALLOC(char *, 2, "Alice", "Bob");

 static u64 u1 = 0xCafeBeefDeadC00ll;
 static double d1 = -1.1;
 static clist secs;
 static u64 u1 = 0xCafeBeefDeadC00ll;
 static double d1 = -1.1;
 static clist secs;


@@ -85,12 +83,14 @@ static time_t t1, t2;
 static u32 ip;
 static int *look = DARY_ALLOC(int, 2, 2, 1);
 static u16 numbers[10] = { 2, 100, 1, 5 };
 static u32 ip;
 static int *look = DARY_ALLOC(int, 2, 2, 1);
 static u16 numbers[10] = { 2, 100, 1, 5 };

+static u32 bitmap1 = 0xff;
+static u32 bitmap2 = 3;

 
 

-static byte *
-parse_u16(byte *string, u16 *ptr)
+static char *
+parse_u16(char *string, u16 *ptr)

 {
   uns a;
 {
   uns a;

-  byte *msg = cf_parse_int(string, &a);
+  char *msg = cf_parse_int(string, &a);

   if (msg)
     return msg;
   if (a >= (1<<16))
   if (msg)
     return msg;
   if (a >= (1<<16))


@@ -112,7 +112,7 @@ static struct cf_user_type u16_type = {
   .dumper = (cf_dumper1*) dump_u16
 };
 
   .dumper = (cf_dumper1*) dump_u16
 };
 

-static byte *
+static char *

 init_top(void *ptr UNUSED)
 {
   for (uns i=0; i<5; i++)
 init_top(void *ptr UNUSED)
 {
   for (uns i=0; i<5; i++)


@@ -125,7 +125,7 @@ init_top(void *ptr UNUSED)
   return NULL;
 }
 
   return NULL;
 }
 

-static byte *
+static char *

 commit_top(void *ptr UNUSED)
 {
   if (nr1 != 15)
 commit_top(void *ptr UNUSED)
 {
   if (nr1 != 15)


@@ -133,7 +133,7 @@ commit_top(void *ptr UNUSED)
   return NULL;
 }
 
   return NULL;
 }
 

-static byte *alphabet[] = { "alpha", "beta", "gamma", "delta", NULL };
+static char *alphabet[] = { "alpha", "beta", "gamma", "delta", NULL };

 static struct cf_section cf_top = {
   CF_INIT(init_top),
   CF_COMMIT(commit_top),
 static struct cf_section cf_top = {
   CF_INIT(init_top),
   CF_COMMIT(commit_top),


@@ -152,6 +152,12 @@ static struct cf_section cf_top = {
     CF_IP("ip", &ip),
     CF_LOOKUP_DYN("look", &look, alphabet, 1000),
     CF_USER_ARY("numbers", numbers, &u16_type, 10),
     CF_IP("ip", &ip),
     CF_LOOKUP_DYN("look", &look, alphabet, 1000),
     CF_USER_ARY("numbers", numbers, &u16_type, 10),

+    CF_BITMAP_INT("bitmap1", &bitmap1),
+    CF_BITMAP_LOOKUP("bitmap2", &bitmap2, ((char*[]) {
+         "one", "two", "three", "four", "five", "six", "seven", "eight", 
+         "nine", "ten", "eleven", "twelve", "thirteen", "fourteen", "fifteen", "seventeen", 
+         "eighteen", "nineteen", "twenty", NULL        // hidden joke here
+         })),

     CF_END
   }
 };
     CF_END
   }
 };


@@ -172,7 +178,7 @@ CF_USAGE
 ";
 
 static void NONRET
 ";
 
 static void NONRET

-usage(byte *msg, ...)
+usage(char *msg, ...)

 {
   va_list va;
   va_start(va, msg);
 {
   va_list va;
   va_start(va, msg);