From: Pavel Charvat <pchar@ucw.cz>
Date: Thu, 4 Sep 2014 11:51:12 +0000 (+0000)
Subject: XTypes: CF_XTYPE requires '&' before xt_*, just like most other parameters in CF_... 
X-Git-Tag: v6.2~6^2~2
X-Git-Url: http://mj.ucw.cz/gitweb/?a=commitdiff_plain;h=0895fc9a44fde521ec31e066cccafd052f2a15a0;p=libucw.git

XTypes: CF_XTYPE requires '&' before xt_*, just like most other parameters in CF_* macros.
---

diff --git a/ucw/conf-test.c b/ucw/conf-test.c
index 12434c98..8ec5dd9f 100644
--- a/ucw/conf-test.c
+++ b/ucw/conf-test.c
@@ -158,7 +158,7 @@ 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_XTYPE("intmax", &intmax, xt_intmax),
+    CF_XTYPE("intmax", &intmax, &xt_intmax),
     CF_BITMAP_INT("bitmap1", &bitmap1),
     CF_BITMAP_LOOKUP("bitmap2", &bitmap2, ((const char* const[]) {
 	  "one", "two", "three", "four", "five", "six", "seven", "eight", 
diff --git a/ucw/conf.h b/ucw/conf.h
index 3de2938d..f3a85066 100644
--- a/ucw/conf.h
+++ b/ucw/conf.h
@@ -431,17 +431,17 @@ struct cf_section {			/** A section. **/
  * An extended type.
  * See <<xtypes:,extended types>> if you want to know more.
  **/
-#define CF_XTYPE(n,p,t)		{ .cls = CC_STATIC, .type = CT_XTYPE, .name = n, .number = 1, .ptr = p, .u.xtype = &t }
+#define CF_XTYPE(n,p,t)		{ .cls = CC_STATIC, .type = CT_XTYPE, .name = n, .number = 1, .ptr = p, .u.xtype = t }
 /**
  * Static array of extended types (all of the same type).
  * See <<xtypes:,extended types>>.
  **/
-#define CF_XTYPE_ARY(n,p,t,c)	{ .cls = CC_STATIC, .type = CT_XTYPE, .name = n, .number = c, .ptr = p, .u.xtype = &t }
+#define CF_XTYPE_ARY(n,p,t,c)	{ .cls = CC_STATIC, .type = CT_XTYPE, .name = n, .number = c, .ptr = p, .u.xtype = t }
 /**
  * Dynamic array of extended types.
  * See <<xtypes:,extended types>>.
  **/
-#define CF_XTYPE_DYN(n,p,t,c)	{ .cls = CC_DYNAMIC, .type = CT_XTYPE, .name = n, .number = c, .ptr = p, .u.xtype = &t }
+#define CF_XTYPE_DYN(n,p,t,c)	{ .cls = CC_DYNAMIC, .type = CT_XTYPE, .name = n, .number = c, .ptr = p, .u.xtype = t }
 
 /**
  * Any number of dynamic array elements