libaitio/inc/aitio.h - diff

Return to aitio.h CVS log

Up to [ELWIX - Embedded LightWeight unIX -] / libaitio / inc

Diff for /libaitio/inc/aitio.h between versions 1.22 and 1.22.2.7

version 1.22, 2012/07/25 15:21:59	version 1.22.2.7, 2012/07/30 13:54:49
Line 228 typedef struct {	Line 228 typedef struct {
strlcat((char*) __val->val.string, (_v), \	strlcat((char*) __val->val.string, (_v), \
AIT_LEN(__val)); \	AIT_LEN(__val)); \
} } while (0)	} } 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); \	#define AIT_SET_BLOB(_vl, _n, _len) do { ait_val_t *__val = (_vl); assert(__val); \
__val->val_type = blob; __val->val.blob = _n; \	__val->val_type = blob; __val->val.blob = _n; \
AIT_LEN(__val) = _len; } while (0)	AIT_LEN(__val) = _len; } while (0)
#define AIT_SET_BLOB2(_vl, _bv) do { ait_val_t *__val = (_vl); assert(__val); assert((_bv)); \	#define AIT_SET_BLOB2(_vl, _bv) do { ait_val_t *__val = (_vl); assert(__val); assert((_bv)); \
__val->val_type = blob; AIT_LEN(__val) = (_bv)->blob_len; \	__val->val_type = blob; AIT_LEN(__val) = \
	(_bv)->blob_len; \
__val->val.blob = (_bv)->blob_var; } while (0)	__val->val.blob = (_bv)->blob_var; } while (0)
#define AIT_NEW_BLOB(_vl, _len) AIT_SET_BLOB((_vl), 0, _len)	#define AIT_NEW_BLOB(_vl, _len) AIT_SET_BLOB((_vl), 0, _len)

Line 270 typedef struct {	Line 281 typedef struct {
#define AIT_COPY_VAL(_vl, _v) do { memcpy((_vl), (_v), sizeof(ait_val_t)); \	#define AIT_COPY_VAL(_vl, _v) do { memcpy((_vl), (_v), sizeof(ait_val_t)); \
switch (AIT_TYPE((_vl))) { \	switch (AIT_TYPE((_vl))) { \
case buffer: \	case buffer: \
AIT_SET_BUF((_vl), AIT_GET_BUF((_v)), AIT_LEN((_v))); \	AIT_SET_BUF((_vl), \
	AIT_GET_BUF((_v)), \
	AIT_LEN((_v))); \
break; \	break; \
case string: \	case string: \
AIT_SET_STR((_vl), AIT_GET_STR((_v))); \	AIT_SET_STR((_vl), \
	AIT_GET_STR((_v))); \
break; \	break; \
default: \	default: \
break; \	break; \
Line 281 typedef struct {	Line 295 typedef struct {
} while (0)	} while (0)
#define AIT_COPY_VAL2(_vl, _v) do { AIT_COPY_VAL((_vl), (_v)); \	#define AIT_COPY_VAL2(_vl, _v) do { AIT_COPY_VAL((_vl), (_v)); \
if (AIT_TYPE((_vl)) == data) \	if (AIT_TYPE((_vl)) == data) \
AIT_SET_DATA((_vl), AIT_GET_DATA((_v)), AIT_LEN((_v))); \	AIT_SET_DATA((_vl), AIT_GET_DATA((_v)), \
	AIT_LEN((_v))); \
} while (0)	} while (0)

#define AIT_INIT_VAL(_vl) (memset((_vl), 0, sizeof(ait_val_t)))	#define AIT_INIT_VAL(_vl) (memset((_vl), 0, sizeof(ait_val_t)))
	#define AIT_INIT_VAL2(_vl, _t) do { \
	AIT_INIT_VAL((_vl)); \
	(_vl)->val_type = _t; \
	} while (0)
/* if attribute zeroCopy is set not execute io_free() */	/* if attribute zeroCopy is set not execute io_free() */
#define AIT_FREE_VAL(_vl) do { ait_val_t *__val = (_vl); assert(__val); \	#define AIT_FREE_VAL(_vl) do { ait_val_t *__val = (_vl); assert(__val); \
switch (AIT_TYPE(__val)) { \	switch (AIT_TYPE(__val)) { \
Line 312 typedef struct {	Line 331 typedef struct {
switch (AIT_TYPE(__val)) { \	switch (AIT_TYPE(__val)) { \
case buffer: \	case buffer: \
case string: \	case string: \
memset(__val->val.buffer, 0, \	if (__val->val.buffer) \
	memset(__val->val.buffer, 0, \
AIT_LEN(__val)); \	AIT_LEN(__val)); \
break; \	break; \
case data: \
memset(__val->val_data, 0, \
AIT_LEN(__val)); \
break; \
default: \	default: \
__val->val.net = 0LL; \	__val->val.net = 0LL; \
break; \	break; \
} \	} \
AIT_KEY(__val) = 0; \	AIT_KEY(__val) = 0; \
} while (0)	} while (0)
	#define AIT_ZERO_VAL2(_vl) do { assert((_vl)); \
	if (AIT_TYPE((_vl)) == data) \
	memset((_vl)->val_data, 0, AIT_LEN((_vl))); \
	} while (0)

struct io_ether_addr {	struct io_ether_addr {
u_int8_t ether_addr_octet[6];	u_int8_t ether_addr_octet[6];
Line 815 int io_arrayMake(char * __restrict psArgs, int nargs,	Line 835 int io_arrayMake(char * __restrict psArgs, int nargs,
*/	*/
int io_MakeAV(const char * __restrict csArgs, const char *csDelim,	int io_MakeAV(const char * __restrict csArgs, const char *csDelim,
char * __restrict psAttr, int attrLen, char * __restrict psValue, int valLen);	char * __restrict psAttr, int attrLen, char * __restrict psValue, int valLen);
	/*
	* io_MakeAV2() Parse and make attribute/value pair over input string
	*
	* @csArgs = Input argument line, will be modified!
	* @csDelim = Delimiter for separate
	* @psAttr = Output Attribute
	* @psValue = Output Value, if ==NULL this element not present value or not wanted for return
	* return: 0 error format; -1 error:: can`t read; >0 ok, number of readed items
	*/
	int io_MakeAV2(char * __restrict psArgs, const char *csDelim,
	char __restrict psAttr, char __restrict psValue);

/*	/*
* io_sarrInit() - Create and initialize dynamic split-order array	* io_sarrInit() - Create and initialize dynamic split-order array

FreeBSD-CVSweb <freebsd-cvsweb@FreeBSD.org>

Removed from v.1.22
changed lines
	Added in v.1.22.2.7