--- libaitio/inc/aitio.h 2012/08/02 00:47:46 1.24 +++ libaitio/inc/aitio.h 2012/08/08 16:01:16 1.24.2.2 @@ -3,7 +3,7 @@ * by Michael Pounov * * $Author: misho $ -* $Id: aitio.h,v 1.24 2012/08/02 00:47:46 misho Exp $ +* $Id: aitio.h,v 1.24.2.2 2012/08/08 16:01:16 misho Exp $ * ************************************************************************** The ELWIX and AITNET software is distributed under the following @@ -170,6 +170,8 @@ typedef struct { #define AIT_GET_DATA(_vl) (assert(AIT_TYPE((_vl)) == data), (_vl)->val_data) #define AIT_GET_BUF(_vl) (assert(AIT_TYPE((_vl)) == buffer), (_vl)->val.buffer) #define AIT_GET_STR(_vl) (assert(AIT_TYPE((_vl)) == string), (char*) (_vl)->val.string) +#define AIT_GET_STRZ(_vl) (assert(AIT_TYPE((_vl)) == string), (_vl)->val.string ? \ + (char*) (_vl)->val.string : "") #define AIT_GET_BLOB(_vl) (assert(AIT_TYPE((_vl)) == blob), (_vl)->val.blob) #define AIT_GET_U8(_vl) (assert(AIT_TYPE((_vl)) == u8), (_vl)->val.u8) #define AIT_GET_U16(_vl) (assert(AIT_TYPE((_vl)) == u16), (_vl)->val.u16) @@ -216,7 +218,7 @@ typedef struct { } } while (0) #define AIT_SET_STR(_vl, _v) do { ait_val_t *__val = (_vl); const char *__s = (_v); assert(__val); \ __val->val_type = string; \ - if (__s && *__s) { \ + if (__s) { \ __val->val.string = (int8_t*) io_strdup(__s); \ AIT_LEN(__val) = strlen((const char*) \ __val->val.string) + 1; \ @@ -338,6 +340,11 @@ typedef struct { #define AIT_INIT_VAL2(_vl, _t) do { \ AIT_INIT_VAL((_vl)); \ (_vl)->val_type = _t; \ + } while (0) +#define AIT_SET_LIKE(_vl, _t, _l, _v) do { assert((_vl)); \ + AIT_INIT_VAL2((_vl), _t); \ + AIT_LEN((_vl)) = _l; AIT_IN((_vl)) = 1; \ + AIT_RAW((_vl)) = (uint64_t) (_v); \ } while (0) /* if attribute zeroCopy is set not execute io_free() */ #define AIT_FREE_VAL(_vl) do { ait_val_t *__val = (_vl); assert(__val); \