--- libaitio/inc/aitio.h 2012/07/25 15:21:59 1.22 +++ libaitio/inc/aitio.h 2012/07/29 23:50:16 1.22.2.1 @@ -3,7 +3,7 @@ * by Michael Pounov * * $Author: misho $ -* $Id: aitio.h,v 1.22 2012/07/25 15:21:59 misho Exp $ +* $Id: aitio.h,v 1.22.2.1 2012/07/29 23:50:16 misho Exp $ * ************************************************************************** The ELWIX and AITNET software is distributed under the following @@ -228,6 +228,16 @@ typedef struct { strlcat((char*) __val->val.string, (_v), \ AIT_LEN(__val)); \ } } while (0) +#define AIT_SET_STRCPY(_vl, _v) do { ait_val_t *__val = (_vl); assert(__val); \ + assert(AIT_TYPE(__val) == string); \ + void *__p = io_realloc(__val->val.string, \ + strlen((_v)) + 1); \ + if (__p) { \ + __val->val.string = __p; \ + AIT_LEN(__val) = strlen((_v)) + 1; \ + strlcpy((char*) __val->val.string, (_v), \ + AIT_LEN(__val)); \ + } } while (0) #define AIT_SET_BLOB(_vl, _n, _len) do { ait_val_t *__val = (_vl); assert(__val); \ __val->val_type = blob; __val->val.blob = _n; \ AIT_LEN(__val) = _len; } while (0) @@ -285,6 +295,10 @@ typedef struct { } while (0) #define AIT_INIT_VAL(_vl) (memset((_vl), 0, sizeof(ait_val_t))) +#define AIT_INIT_VAL2(_vl, _t) do { \ + AIT_INIT_VAL((_vl)); \ + AIT_TYPE((_vl)) = _t; \ + } while (0) /* if attribute zeroCopy is set not execute io_free() */ #define AIT_FREE_VAL(_vl) do { ait_val_t *__val = (_vl); assert(__val); \ switch (AIT_TYPE(__val)) { \