#include <string.h>
#include <stdio.h>
-#define TRY(f) do { byte *_msg = f; if (_msg) return _msg; } while (0)
+#define TRY(f) do { char *_msg = f; if (_msg) return _msg; } while (0)
/* Register size of and parser for each basic type */
-static byte *
-cf_parse_string(byte *str, byte **ptr)
+static char *
+cf_parse_string(char *str, char **ptr)
{
*ptr = cf_strdup(str);
return NULL;
}
-typedef byte *cf_basic_parser(byte *str, void *ptr);
+typedef char *cf_basic_parser(char *str, void *ptr);
static struct {
uns size;
void *parser;
{ sizeof(u64), cf_parse_u64 },
{ sizeof(double), cf_parse_double },
{ sizeof(u32), cf_parse_ip },
- { sizeof(byte*), cf_parse_string },
+ { sizeof(char*), cf_parse_string },
{ sizeof(int), NULL }, // lookups are parsed extra
{ 0, NULL }, // user-defined types are parsed extra
};
return utype->size;
}
-static byte *
-cf_parse_lookup(byte *str, int *ptr, byte **t)
+static char *
+cf_parse_lookup(char *str, int *ptr, char **t)
{
- byte **n = t;
+ char **n = t;
uns total_len = 0;
while (*n && strcasecmp(*n, str)) {
total_len += strlen(*n) + 2;
*ptr = n - t;
return NULL;
}
- byte *err = cf_malloc(total_len + strlen(str) + 60), *c = err;
+ char *err = cf_malloc(total_len + strlen(str) + 60), *c = err;
c += sprintf(err, "Invalid value %s, possible values are: ", str);
for (n=t; *n; n++)
c+= sprintf(c, "%s, ", *n);
return err;
}
-static byte *
-cf_parse_ary(uns number, byte **pars, void *ptr, enum cf_type type, union cf_union *u)
+static char *
+cf_parse_ary(uns number, char **pars, void *ptr, enum cf_type type, union cf_union *u)
{
for (uns i=0; i<number; i++)
{
- byte *msg;
+ char *msg;
uns size = cf_type_size(type, u->utype);
if (type < CT_LOOKUP)
msg = ((cf_basic_parser*) parsers[type].parser) (pars[i], ptr + i * size);
/* Interpreter */
#define T(x) #x,
-byte *cf_op_names[] = { CF_OPERATIONS };
+char *cf_op_names[] = { CF_OPERATIONS };
#undef T
-byte *cf_type_names[] = { "int", "u64", "double", "ip", "string", "lookup", "user" };
+char *cf_type_names[] = { "int", "u64", "double", "ip", "string", "lookup", "user" };
#define DARY_HDR_SIZE ALIGN_TO(sizeof(uns), CPU_STRUCT_ALIGN)
-static byte *
-interpret_set_dynamic(struct cf_item *item, int number, byte **pars, void **ptr)
+static char *
+interpret_set_dynamic(struct cf_item *item, int number, char **pars, void **ptr)
{
enum cf_type type = item->type;
cf_journal_block(ptr, sizeof(void*));
return cf_parse_ary(number, pars, *ptr, type, &item->u);
}
-static byte *
-interpret_add_dynamic(struct cf_item *item, int number, byte **pars, int *processed, void **ptr, enum cf_operation op)
+static char *
+interpret_add_dynamic(struct cf_item *item, int number, char **pars, int *processed, void **ptr, enum cf_operation op)
{
enum cf_type type = item->type;
void *old_p = *ptr;
return cf_printf("Dynamic arrays do not support operation %s", cf_op_names[op]);
}
-static byte *interpret_set_item(struct cf_item *item, int number, byte **pars, int *processed, void *ptr, uns allow_dynamic);
+static char *interpret_set_item(struct cf_item *item, int number, char **pars, int *processed, void *ptr, uns allow_dynamic);
-static byte *
-interpret_section(struct cf_section *sec, int number, byte **pars, int *processed, void *ptr, uns allow_dynamic)
+static char *
+interpret_section(struct cf_section *sec, int number, char **pars, int *processed, void *ptr, uns allow_dynamic)
{
cf_add_dirty(sec, ptr);
*processed = 0;
for (struct cf_item *ci=sec->cfg; ci->cls; ci++)
{
int taken;
- byte *msg = interpret_set_item(ci, number, pars, &taken, ptr + (uintptr_t) ci->ptr, allow_dynamic && !ci[1].cls);
+ char *msg = interpret_set_item(ci, number, pars, &taken, ptr + (uintptr_t) ci->ptr, allow_dynamic && !ci[1].cls);
if (msg)
return cf_printf("Item %s: %s", ci->name, msg);
*processed += taken;
}
}
-static byte *
-interpret_add_list(struct cf_item *item, int number, byte **pars, int *processed, void *ptr, enum cf_operation op)
+static char *
+interpret_add_list(struct cf_item *item, int number, char **pars, int *processed, void *ptr, enum cf_operation op)
{
if (op >= OP_REMOVE)
return cf_printf("You have to open a block for operation %s", cf_op_names[op]);
/* If the node contains any dynamic attribute at the end, we suppress
* auto-repetition here and pass the flag inside instead. */
index++;
- byte *msg = interpret_section(sec, number, pars, &taken, node, sec->flags & SEC_FLAG_DYNAMIC);
+ char *msg = interpret_section(sec, number, pars, &taken, node, sec->flags & SEC_FLAG_DYNAMIC);
if (msg)
return sec->flags & SEC_FLAG_DYNAMIC ? msg : cf_printf("Node %d of list %s: %s", index, item->name, msg);
*processed += taken;
return NULL;
}
-static byte *
-interpret_add_bitmap(struct cf_item *item, int number, byte **pars, int *processed, u32 *ptr, enum cf_operation op)
+static char *
+interpret_add_bitmap(struct cf_item *item, int number, char **pars, int *processed, u32 *ptr, enum cf_operation op)
{
if (op != OP_SET && op != OP_REMOVE)
return cf_printf("Cannot apply operation %s on a bitmap", cf_op_names[op]);
return NULL;
}
-static byte *
-interpret_set_item(struct cf_item *item, int number, byte **pars, int *processed, void *ptr, uns allow_dynamic)
+static char *
+interpret_set_item(struct cf_item *item, int number, char **pars, int *processed, void *ptr, uns allow_dynamic)
{
int taken;
switch (item->cls)
}
}
-static byte *
+static char *
interpret_set_all(struct cf_item *item, void *ptr, enum cf_operation op)
{
if (item->cls == CC_BITMAP) {
static uns zero = 0;
* (void**) ptr = (&zero) + 1;
} else if (item->cls == CC_STATIC && item->type == CT_STRING) {
- cf_journal_block(ptr, item->number * sizeof(byte*));
- bzero(ptr, item->number * sizeof(byte*));
+ cf_journal_block(ptr, item->number * sizeof(char*));
+ bzero(ptr, item->number * sizeof(char*));
} else
return "The item is not a list, dynamic array, bitmap, or string";
return NULL;
i1 += (uintptr_t) item->ptr;
i2 += (uintptr_t) item->ptr;
if (item->type == CT_STRING)
- return strcmp(* (byte**) i1, * (byte**) i2);
+ return strcmp(* (char**) i1, * (char**) i2);
else // all numeric types
return memcmp(i1, i2, cf_type_size(item->type, item->u.utype));
}
return NULL;
}
-static byte *
+static char *
record_selector(struct cf_item *item, struct cf_section *sec, u32 *mask)
{
uns nr = sec->flags & SEC_FLAG_NUMBER;
} stack[MAX_STACK_SIZE];
static uns level;
-static byte *
+static char *
opening_brace(struct cf_item *item, void *ptr, enum cf_operation op)
{
if (level >= MAX_STACK_SIZE-1)
return NULL;
}
-static byte *
-closing_brace(struct item_stack *st, enum cf_operation op, int number, byte **pars)
+static char *
+closing_brace(struct item_stack *st, enum cf_operation op, int number, char **pars)
{
if (st->op == OP_CLOSE) // top-level
return "Unmatched } parenthesis";
}
static struct cf_item *
-find_item(struct cf_section *curr_sec, const byte *name, byte **msg, void **ptr)
+find_item(struct cf_section *curr_sec, const char *name, char **msg, void **ptr)
{
*msg = NULL;
if (name[0] == '^') // absolute name instead of relative
{
if (curr_sec != &cf_sections)
cf_add_dirty(curr_sec, *ptr);
- byte *c = strchr(name, '.');
+ char *c = strchr(name, '.');
if (c)
*c++ = 0;
struct cf_item *ci = cf_find_subitem(curr_sec, name);
}
}
-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)
{
- byte *msg;
+ char *msg;
if ((op & OP_MASK) == OP_CLOSE)
return closing_brace(stack+level, op, number, pars);
void *ptr = stack[level].base_ptr;
return NULL;
}
-byte *
-cf_find_item(const byte *name, struct cf_item *item)
+char *
+cf_find_item(const char *name, struct cf_item *item)
{
- byte *msg;
+ char *msg;
void *ptr = NULL;
struct cf_item *ci = find_item(&cf_sections, name, &msg, &ptr);
if (msg)
return NULL;
}
-byte *
-cf_write_item(struct cf_item *item, enum cf_operation op, int number, byte **pars)
+char *
+cf_write_item(struct cf_item *item, enum cf_operation op, int number, char **pars)
{
- byte *msg;
+ char *msg;
int taken = 0;
switch (op) {
case OP_SET:
cf_check_stack(void)
{
if (level > 0) {
- log(L_ERROR, "Unterminated block");
+ msg(L_ERROR, "Unterminated block");
return 1;
}
return 0;