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.1 and 1.22.2.16

version 1.22.2.1, 2012/07/29 23:50:16	version 1.22.2.16, 2012/07/31 16:42:38
Line 180 typedef struct {	Line 180 typedef struct {
#define AIT_GET_F32(_vl) (assert(AIT_TYPE((_vl)) == f32), (_vl)->val.f32)	#define AIT_GET_F32(_vl) (assert(AIT_TYPE((_vl)) == f32), (_vl)->val.f32)
#define AIT_GET_F64(_vl) (assert(AIT_TYPE((_vl)) == f64), (_vl)->val.f64)	#define AIT_GET_F64(_vl) (assert(AIT_TYPE((_vl)) == f64), (_vl)->val.f64)

#define AIT_SET_DATA(_vl, _p, _len) do { ait_val_t *__val = (_vl); \	#define AIT_SET_DATA(_vl, _p, _len) do { ait_val_t *__val = io_realloc((_vl), (sizeof(ait_val_t) + _len)); \
__val = io_realloc(__val, sizeof(ait_val_t) + _len); \
if (__val) { \	if (__val) { \
	void *__p = (_p); \
	if (__p) \
	memcpy(__val->val_data, __p, _len); \
__val->val_type = data; AIT_LEN(__val) = _len; \	__val->val_type = data; AIT_LEN(__val) = _len; \
if ((_p)) \	(_vl) = __val; \
memcpy(__val->val_data, (_p), _len); \
} \	} \
(_vl) = __val; \
} while (0);	} while (0);
#define AIT_SET_PTR(_vl, _p, _len) do { ait_val_t *__val = (_vl); assert(__val); \	#define AIT_SET_PTR(_vl, _p, _len) do { ait_val_t *__val = (_vl); assert(__val); \
__val->val_type = ptr; __val->val.ptr = _p; \	__val->val_type = ptr; __val->val.ptr = _p; \
Line 203 typedef struct {	Line 203 typedef struct {
__val->val_type = buffer; AIT_LEN(__val) = _len; \	__val->val_type = buffer; AIT_LEN(__val) = _len; \
memset(__val->val.buffer, _c, _len); \	memset(__val->val.buffer, _c, _len); \
} } while (0)	} } while (0)
#define AIT_SET_BUF(_vl, _v, _len) do { ait_val_t *__val = (_vl); assert(__val); \	#define AIT_SET_BUF(_vl, _v, _len) do { ait_val_t __val = (_vl); void __p = (_v); assert(__val); \
__val->val.buffer = io_malloc(_len); \	__val->val.buffer = io_malloc(_len); \
if (__val->val.buffer) { \	if (__val->val.buffer) { \
__val->val_type = buffer; AIT_LEN(__val) = _len; \	__val->val_type = buffer; AIT_LEN(__val) = _len; \
if ((_v)) \	if (__p) \
memcpy(__val->val.buffer, (_v), _len); \	memcpy(__val->val.buffer, __p, _len); \
else \	else \
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); const char __s = (_v); assert(__val); \
__val->val.string = (int8_t*) io_strdup((_v)); \	__val->val_type = string; \
	if (__s && *__s) { \
	__val->val.string = (int8_t*) io_strdup(__s); \
	AIT_LEN(__val) = strlen((const char*) \
	__val->val.string) + 1; \
	} 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) { \	if (__val->val.string) { \
__val->val_type = string; \	__val->val_type = string; AIT_LEN(__val) = _len; \
AIT_LEN(__val) = strlen((_v)) + 1; \	memset(__val->val.string, 0, _len); \
} } while (0)	} \
#define AIT_SET_STRCAT(_vl, _v) do { ait_val_t *__val = (_vl); assert(__val); \	} while (0)
assert(AIT_TYPE(__val) == string); \	#define AIT_SET_STRCAT(_vl, _v) do { ait_val_t __val = (_vl); const char __s = (_v); int __l; \
void *__p = io_realloc(__val->val.string, \	assert(__val); assert(AIT_TYPE(__val) == string); \
AIT_LEN(__val) + strlen((_v))); \	if (!__s \|\| !*__s) \
	break; \
	else \
	__l = strlen(__s); \
	if (!__val->val.string) \
	__l++; \
	void *__p = io_realloc(__val->val.string, AIT_LEN(__val) + __l); \
if (__p) { \	if (__p) { \
	AIT_LEN(__val) += __l; \
__val->val.string = __p; \	__val->val.string = __p; \
AIT_LEN(__val) += strlen((_v)); \	strlcat((char*) __val->val.string, __s, \
strlcat((char*) __val->val.string, (_v), \
AIT_LEN(__val)); \	AIT_LEN(__val)); \
	} \
	} while (0)
	#define AIT_SET_STRCPY(_vl, _v) do { ait_val_t __val = (_vl); const char __s = (_v); int __l; \
	assert(__val); assert(AIT_TYPE(__val) == string); \
	if (!__s \|\| !*__s) \
	break; \
	else \
	__l = strlen(__s) + 1; \
	void *__p = io_realloc(__val->val.string, __l); \
	if (__p) { \
	AIT_LEN(__val) = __l; \
	__val->val.string = __p; \
	strlcpy((char*) __val->val.string, __s, \
	AIT_LEN(__val)); \
} } while (0)	} } while (0)
#define AIT_SET_STRCPY(_vl, _v) do { ait_val_t *__val = (_vl); assert(__val); \	#define AIT_SET_STRLCPY(_vl, _v, _len) do { ait_val_t __val = (_vl); const char __s = (_v); \
assert(AIT_TYPE(__val) == string); \	assert(__val); assert(AIT_TYPE(__val) == string); \
void *__p = io_realloc(__val->val.string, \	if (!__s \|\| !*__s) \
strlen((_v)) + 1); \	break; \
	void *__p = io_realloc(__val->val.string, _len); \
if (__p) { \	if (__p) { \
	AIT_LEN(__val) = _len; \
__val->val.string = __p; \	__val->val.string = __p; \
AIT_LEN(__val) = strlen((_v)) + 1; \	strlcpy((char*) __val->val.string, __s, \
strlcpy((char*) __val->val.string, (_v), \
AIT_LEN(__val)); \	AIT_LEN(__val)); \
} } while (0)	} } 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 277 typedef struct {	Line 310 typedef struct {
__val->val_type = f64; __val->val.f64 = _n; \	__val->val_type = f64; __val->val.f64 = _n; \
AIT_LEN(__val) = sizeof(double); } while (0)	AIT_LEN(__val) = sizeof(double); } while (0)

#define AIT_COPY_VAL(_vl, _v) do { memcpy((_vl), (_v), sizeof(ait_val_t)); \	#define AIT_COPY_VAL(_vl, _v) do { ait_val_t *__val = (_vl); assert(__val); \
switch (AIT_TYPE((_vl))) { \	memcpy(__val, (_v), sizeof(ait_val_t)); \
	switch (AIT_TYPE(__val)) { \
case buffer: \	case buffer: \
AIT_SET_BUF((_vl), AIT_GET_BUF((_v)), AIT_LEN((_v))); \	AIT_SET_BUF(__val, \
	AIT_GET_BUF((_v)), \
	AIT_LEN((_v))); \
break; \	break; \
case string: \	case string: \
AIT_SET_STR((_vl), AIT_GET_STR((_v))); \	AIT_SET_STR(__val, \
	AIT_GET_STR((_v))); \
break; \	break; \
	case data: \
	AIT_SET_DATA(__val, \
	AIT_GET_DATA((_v)), \
	AIT_LEN((_v))); \
	break; \
default: \	default: \
break; \	break; \
} \	} \
} while (0)	} while (0)
#define AIT_COPY_VAL2(_vl, _v) do { AIT_COPY_VAL((_vl), (_v)); \
if (AIT_TYPE((_vl)) == data) \
AIT_SET_DATA((_vl), AIT_GET_DATA((_v)), AIT_LEN((_v))); \
} 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 { \	#define AIT_INIT_VAL2(_vl, _t) do { \
AIT_INIT_VAL((_vl)); \	AIT_INIT_VAL((_vl)); \
AIT_TYPE((_vl)) = _t; \	(_vl)->val_type = _t; \
} while (0)	} 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); \
Line 326 typedef struct {	Line 364 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: \	case data: \
memset(__val->val_data, 0, \	memset(__val->val_data, 0, AIT_LEN(__val)); \
AIT_LEN(__val)); \
break; \	break; \
default: \	default: \
__val->val.net = 0LL; \	__val->val.net = 0LL; \
Line 491 inline ait_val_t *io_allocVar(void);	Line 529 inline ait_val_t *io_allocVar(void);
*/	*/
inline void io_freeVar(ait_val_t ** __restrict val);	inline void io_freeVar(ait_val_t ** __restrict val);
/*	/*
	* io_makeVar() - Allocate memory and fill variable
	*
	* @type = type of variable
	* @... = arg1 is value of variable
	* @... = arg2 is length of variabla. Not required for numbers and strings!
	* return: NULL error or new variable, after use free variable with io_freeVar()
	*/
	ait_val_t *io_makeVar(ait_type_t type, ...);
	/*
* io_allocVars() - Allocate ait_val_t array	* io_allocVars() - Allocate ait_val_t array
*	*
* @varnum = Number of variables	* @varnum = Number of variables
Line 829 int io_arrayMake(char * __restrict psArgs, int nargs,	Line 876 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.2.1
changed lines
	Added in v.1.22.2.16