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.2.3 and 1.22.2.11

version 1.22.2.3, 2012/07/30 09:26:56	version 1.22.2.11, 2012/07/31 13:37:51
Line 213 typedef struct {	Line 213 typedef struct {
memset(__val->val.buffer, 0, _len); \	memset(__val->val.buffer, 0, _len); \
} } while (0)	} } while (0)
#define AIT_SET_STR(_vl, _v) do { ait_val_t *__val = (_vl); assert(__val); \	#define AIT_SET_STR(_vl, _v) do { ait_val_t *__val = (_vl); assert(__val); \
__val->val.string = (int8_t*) io_strdup((_v)); \	__val->val_type = string; \
if (__val->val.string) { \	if ((_v)) { \
__val->val_type = string; \	__val->val.string = (int8_t*) io_strdup((_v)); \
AIT_LEN(__val) = strlen((_v)) + 1; \	AIT_LEN(__val) = strlen((_v)) + 1; \
} } while (0)	} else { \
	__val->val.string = NULL; \
	AIT_LEN(__val) = 0; \
	} \
	} while (0)
	#define AIT_SET_STRSIZ(_vl, _len) do { ait_val_t *__val = (_vl); assert(__val); \
	__val->val.string = (int8_t*) io_malloc(_len); \
	if (__val->val.string) { \
	__val->val_type = string; AIT_LEN(__val) = _len; \
	memset(__val->val.string, 0, _len); \
	} \
	} while (0)
#define AIT_SET_STRCAT(_vl, _v) do { ait_val_t *__val = (_vl); assert(__val); \	#define AIT_SET_STRCAT(_vl, _v) do { ait_val_t *__val = (_vl); assert(__val); \
assert(AIT_TYPE(__val) == string); \	assert(AIT_TYPE(__val) == string); \
	if (!__val->val.string) \
	AIT_LEN(__val) = 1; \
void *__p = io_realloc(__val->val.string, \	void *__p = io_realloc(__val->val.string, \
AIT_LEN(__val) + strlen((_v))); \	AIT_LEN(__val) + strlen((_v))); \
if (__p) { \	if (__p) { \
__val->val.string = __p; \
AIT_LEN(__val) += strlen((_v)); \	AIT_LEN(__val) += strlen((_v)); \
	if (!__val->val.string) \
	memset(__p, 0, AIT_LEN(__val)); \
	__val->val.string = __p; \
strlcat((char*) __val->val.string, (_v), \	strlcat((char*) __val->val.string, (_v), \
AIT_LEN(__val)); \	AIT_LEN(__val)); \
} } while (0)	} else \
	if (!__val->val.string) \
	AIT_LEN(__val) = 0; \
	} while (0)
#define AIT_SET_STRCPY(_vl, _v) do { ait_val_t *__val = (_vl); assert(__val); \	#define AIT_SET_STRCPY(_vl, _v) do { ait_val_t *__val = (_vl); assert(__val); \
assert(AIT_TYPE(__val) == string); \	assert(AIT_TYPE(__val) == string); \
void *__p = io_realloc(__val->val.string, \	void *__p = io_realloc(__val->val.string, \
Line 238 typedef struct {	Line 256 typedef struct {
strlcpy((char*) __val->val.string, (_v), \	strlcpy((char*) __val->val.string, (_v), \
AIT_LEN(__val)); \	AIT_LEN(__val)); \
} } while (0)	} } while (0)
	#define AIT_SET_STRLCPY(_vl, _v, _len) do { ait_val_t *__val = (_vl); assert(__val); \
	assert(AIT_TYPE(__val) == string); \
	void *__p = io_realloc(__val->val.string, _len); \
	if (__p) { \
	__val->val.string = __p; AIT_LEN(__val) = _len; \
	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)
Line 331 typedef struct {	Line 357 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 843 int io_MakeAV(const char * __restrict csArgs, const ch	Line 870 int io_MakeAV(const char * __restrict csArgs, const ch
* @psValue = Output Value, if ==NULL this element not present value or not wanted for return	* @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	* return: 0 error format; -1 error:: can`t read; >0 ok, number of readed items
*/	*/
int io_MakeAV2(char ** __restrict psArgs, const char *csDelim,	int io_MakeAV2(char * __restrict psArgs, const char *csDelim,
char * __restrict psAttr, char * __restrict psValue);	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.2.3
changed lines
	Added in v.1.22.2.11