From 9adf0cac23ff0639f64a9d510c71e5aab44c27e9 Mon Sep 17 00:00:00 2001 From: Pavel Charvat Date: Thu, 4 Sep 2014 12:14:58 +0000 Subject: [PATCH] XTypes: Fixed dump of configuration. --- ucw/conf-dump.c | 3 +-- ucw/conf-intr.c | 2 +- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/ucw/conf-dump.c b/ucw/conf-dump.c index cc5ddb37..9932f1d4 100644 --- a/ucw/conf-dump.c +++ b/ucw/conf-dump.c @@ -69,12 +69,11 @@ dump_item(struct fastbuf *fb, struct cf_item *item, int level, void *ptr) else bprintf(fb, "%d ", item->number); if (item->cls == CC_STATIC || item->cls == CC_DYNAMIC || item->cls == CC_BITMAP) { + bprintf(fb, "T%s ", cf_type_names[type]); if (item->type == CT_USER) bprintf(fb, "U%s S%d ", item->u.utype->name, size); else if (item->type == CT_XTYPE) bprintf(fb, "X%s S%d ", item->u.xtype->name, size); - else - bprintf(fb, "T%s ", cf_type_names[type]); } if (item->cls == CC_STATIC) { for (i=0; inumber; i++) diff --git a/ucw/conf-intr.c b/ucw/conf-intr.c index 6ef07830..741cd80b 100644 --- a/ucw/conf-intr.c +++ b/ucw/conf-intr.c @@ -112,7 +112,7 @@ cf_parse_ary(uint number, char **pars, void *ptr, enum cf_type type, union cf_un #define T(x) #x, char *cf_op_names[] = { CF_OPERATIONS }; #undef T -char *cf_type_names[] = { "int", "u64", "double", "ip", "string", "lookup", "user" }; +char *cf_type_names[] = { "int", "u64", "double", "ip", "string", "lookup", "user", "xtype" }; static char * interpret_set_dynamic(struct cf_item *item, int number, char **pars, void **ptr) -- 2.39.2