libaitcfg/src/queue.c - diff

Return to queue.c CVS log

Up to [ELWIX - Embedded LightWeight unIX -] / libaitcfg / src

Diff for /libaitcfg/src/queue.c between versions 1.6.4.2 and 1.15.2.1

version 1.6.4.2, 2012/04/02 15:12:15	version 1.15.2.1, 2014/04/14 19:57:04
Line 12 terms:	Line 12 terms:
All of the documentation and software included in the ELWIX and AITNET	All of the documentation and software included in the ELWIX and AITNET
Releases is copyrighted by ELWIX - Sofia/Bulgaria <info@elwix.org>	Releases is copyrighted by ELWIX - Sofia/Bulgaria <info@elwix.org>

Copyright 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012	Copyright 2004 - 2014
by Michael Pounov <misho@elwix.org>. All rights reserved.	by Michael Pounov <misho@elwix.org>. All rights reserved.

Redistribution and use in source and binary forms, with or without	Redistribution and use in source and binary forms, with or without
Line 49 SUCH DAMAGE.	Line 49 SUCH DAMAGE.
static inline struct tagCfg *	static inline struct tagCfg *
_selectAttribute(cfg_root_t * __restrict cfg, const char csSec, const char csAttr)	_selectAttribute(cfg_root_t * __restrict cfg, const char csSec, const char csAttr)
{	{
struct tagCfg fav;	struct tagCfg fav, *c;

if (!cfg)	if (!cfg)
return NULL;	return NULL;
Line 58 _selectAttribute(cfg_root_t * __restrict cfg, const ch	Line 58 _selectAttribute(cfg_root_t * __restrict cfg, const ch

if (csSec && *csSec)	if (csSec && *csSec)
AIT_KEY(&fav.cfg_sec) = crcFletcher16((u_short*) csSec,	AIT_KEY(&fav.cfg_sec) = crcFletcher16((u_short*) csSec,
io_align(strlen(csSec), 1) / 2);	E_ALIGN(strlen(csSec), 2) / 2);
if (csAttr)	if (csAttr)
AIT_KEY(&fav.cfg_attr) = crcFletcher16((u_short*) csAttr,	AIT_KEY(&fav.cfg_attr) = crcFletcher16((u_short*) csAttr,
io_align(strlen(csAttr), 1) / 2);	E_ALIGN(strlen(csAttr), 2) / 2);

/*
struct tagCfg *av;

RB_FOREACH(av, tagRC, cfg) {
printf("sec=%s(%d) attr=%s(%d) val=%s\n", AIT_GET_LIKE(&av->cfg_sec, char*), AIT_KEY(&av->cfg_sec),
AIT_GET_LIKE(&av->cfg_attr, char*), AIT_KEY(&av->cfg_attr), AIT_GET_STR(&av->cfg_val));
}

printf("ssss=%d aaaa=%d\n", AIT_KEY(&fav.cfg_sec), AIT_KEY(&fav.cfg_attr));
*/
if (!csAttr)	if (!csAttr)
return RB_NFIND(tagRC, cfg, &fav);	return RB_NFIND(tagRC, cfg, &fav);
else	else {
return RB_FIND(tagRC, cfg, &fav);	c = RB_FIND(tagRC, cfg, &fav);
	if (!c)
	return NULL; /* not found */
	do {
	if (!strcmp(AIT_GET_STR(&c->cfg_attr), csAttr))
	return c; /* FOUND! */
	} while ((c = RB_NEXT(tagRC, cfg, c)) && c && !cfg_tree_cmp(c, &fav));
	return NULL; /* not found */
	}
}	}

static inline void	/* --------------------------------------------------------------- */
_destroyAttribute(struct tagCfg *av)
	/*
	* cfg_getSection() - Get entire section attributes into array
	*
	* @cfg = Config root
	* @csSec = Config section //[{csSec}]
	* return: NULL not found or !=NULL allocated array, must free with array_Destroy() after use!
	*/
	array_t *
	cfg_getSection(cfg_root_t * __restrict cfg, const char *csSec)
{	{
	array_t *arr = NULL;
	struct tagCfg *av, fav;

	if (!cfg) {
	cfg_SetErr(EINVAL, "Invalid argument(s)");
	return NULL;
	} else
	memset(&fav, 0, sizeof fav);
	if (csSec && !*csSec)
	csSec = NULL;

	if (csSec && *csSec)
	AIT_KEY(&fav.cfg_sec) = crcFletcher16((u_short*) csSec,
	E_ALIGN(strlen(csSec), 2) / 2);

	av = RB_NFIND(tagRC, cfg, &fav);
if (!av)	if (!av)
return;	return NULL;
	if (csSec) {
	if (AIT_ISEMPTY(&av->cfg_sec) \|\| strcmp(AIT_GET_STR(&av->cfg_sec), csSec))
	return NULL;
	} else {
	if (!AIT_ISEMPTY(&av->cfg_sec))
	return NULL;
	}

AIT_FREE_VAL(&av->cfg_val);	arr = array_Init(1);
AIT_FREE_VAL(&av->cfg_attr);	if (!arr) {
AIT_FREE_VAL(&av->cfg_sec);	cfg_SetErr(elwix_GetErrno(), "%s", elwix_GetError());
free(av);	return NULL;
}	} else
	array_Push(arr, av, 0);

// ----------------------------------------------	while ((av = RB_NEXT(tagRC, cfg, av)) && av) {
	if (csSec) {
	if (AIT_ISEMPTY(&av->cfg_sec) \|\| strcmp(AIT_GET_STR(&av->cfg_sec), csSec))
	break;
	} else {
	if (!AIT_ISEMPTY(&av->cfg_sec))
	break;
	}

	array_Push(arr, av, 0);
	}

	return arr;
	}

/*	/*
* cfg_findAttribute() - Find attribute position in config file	* cfg_findAttribute() - Find attribute position in config file
*	*
* @cfg = Config root	* @cfg = Config root
* @csSec = Config section //[{csSec}]	* @csSec = Config section //[{csSec}]
* @csAttr = Config attribute //{csAttr} = ...	* @csAttr = Config attribute //{csAttr} = ..., if NULL as any attribute
* return: 0 not found item, -1 error or >0 position in list	* return: 0 not found item, -1 error or >0 position in list
*/	*/
inline int	int
cfg_findAttribute(cfg_root_t * __restrict cfg, const char csSec, const char csAttr)	cfg_findAttribute(cfg_root_t * __restrict cfg, const char csSec, const char csAttr)
{	{
struct tagCfg *av, fav;	struct tagCfg *av, fav;
register int cx = 0;	register int cx = 0;

if (!cfg \|\| !csAttr) {	if (!cfg) {
cfg_SetErr(EINVAL, "Invalid argument(s)");	cfg_SetErr(EINVAL, "Invalid argument(s)");
return -1;	return -1;
} else	} else
Line 115 cfg_findAttribute(cfg_root_t * __restrict cfg, const c	Line 159 cfg_findAttribute(cfg_root_t * __restrict cfg, const c

if (csSec && *csSec)	if (csSec && *csSec)
AIT_KEY(&fav.cfg_sec) = crcFletcher16((u_short*) csSec,	AIT_KEY(&fav.cfg_sec) = crcFletcher16((u_short*) csSec,
io_align(strlen(csSec), 1) / 2);	E_ALIGN(strlen(csSec), 2) / 2);
if (csAttr)	if (csAttr)
AIT_KEY(&fav.cfg_attr) = crcFletcher16((u_short*) csAttr,	AIT_KEY(&fav.cfg_attr) = crcFletcher16((u_short*) csAttr,
io_align(strlen(csAttr), 1) / 2);	E_ALIGN(strlen(csAttr), 2) / 2);

SLIST_FOREACH(av, cfg, cfg_next) {	TAILQ_FOREACH(av, cfg, cfg_next) {
++cx;	++cx;
if (!cfg_tree_cmp(&fav, av))	if (!cfg_tree_cmp(&fav, av))
return cx;	return cx;
Line 128 cfg_findAttribute(cfg_root_t * __restrict cfg, const c	Line 172 cfg_findAttribute(cfg_root_t * __restrict cfg, const c

return 0;	return 0;
}	}
#if 0
/*	/*
* cfg_UnsetAttribute() Unset item from config list and free resources	* cfg_unsetAttribute() - Unset item from config and free resources
* @cfg = Head list element	*
	* @cfg = Config root
* @csSec = Config section //[{csSec}], if NULL unset in default section	* @csSec = Config section //[{csSec}], if NULL unset in default section
* @csAttr = Config attribute //{csAttr} = ..., if NULL unset as any attribute	* @csAttr = Config attribute //{csAttr} = ..., if NULL as any attribute
* return: 0 item not found, -1 error: null parameters; >0 position in list	* return: 0 item not found, -1 error or 1 removed item
*/	*/
int cfg_UnsetAttribute(sl_config * __restrict cfg, const u_char csSec, const u_char csAttr)	int
	cfg_unsetAttribute(cfg_root_t * __restrict cfg, const char csSec, const char csAttr)
{	{
struct tagPair av, curr;	struct tagCfg *av;
register int cx = 0;

if (!cfg \|\| !csAttr)	if (!cfg)
return -1;	return -1;

av = SelectAttribute(cfg, csSec, csAttr);	av = _selectAttribute(cfg, csSec, csAttr);
if (!av)	if (!av)
return 0;	return 0;

// remove element	CFG_RC_LOCK(cfg);
// remove element when is first!	RB_REMOVE(tagRC, cfg, av);
if (cfg->slh_first == av) {	TAILQ_REMOVE(cfg, av, cfg_next);
cfg->slh_first = cfg->slh_first->sle_next;	CFG_RC_UNLOCK(cfg);

DestroyAttribute(av);	AIT_FREE_VAL(&av->cfg_val);
return 1;	AIT_FREE_VAL(&av->cfg_attr);
}	AIT_FREE_VAL(&av->cfg_sec);
// remove element in other cases...	e_free(av);
curr = cfg->slh_first;	return 1;
while (curr->sle_next != av) {
++cx;
curr = curr->sle_next;
}
curr->sle_next = curr->sle_next->sle_next;

DestroyAttribute(av);
return cx;
}	}
#endif

/*	/*
* cfg_setAttribute() - Set item in config or adding new item if not exists	* cfg_setAttribute() - Set item in config or adding new item if not exists
Line 183 cfg_setAttribute(cfg_root_t * __restrict cfg, const ch	Line 219 cfg_setAttribute(cfg_root_t * __restrict cfg, const ch
{	{
struct tagCfg av, section;	struct tagCfg av, section;

if (!cfg \|\| !csAttr \|\| !csVal)	if (!cfg \|\| !csAttr)
return -1;	return -1;

av = _selectAttribute(cfg, csSec, csAttr);	av = _selectAttribute(cfg, csSec, csAttr);
Line 191 cfg_setAttribute(cfg_root_t * __restrict cfg, const ch	Line 227 cfg_setAttribute(cfg_root_t * __restrict cfg, const ch
/* adding new element */	/* adding new element */
section = _selectAttribute(cfg, csSec, NULL);	section = _selectAttribute(cfg, csSec, NULL);

av = malloc(sizeof(struct tagCfg));	av = e_malloc(sizeof(struct tagCfg));
if (!av) {	if (!av) {
LOGERR;	LOGERR;
return -1;	return -1;
Line 200 cfg_setAttribute(cfg_root_t * __restrict cfg, const ch	Line 236 cfg_setAttribute(cfg_root_t * __restrict cfg, const ch

CFG_RC_LOCK(cfg);	CFG_RC_LOCK(cfg);
if (!section)	if (!section)
SLIST_INSERT_HEAD(cfg, av, cfg_next);	TAILQ_INSERT_TAIL(cfg, av, cfg_next);
else	else
SLIST_INSERT_AFTER(section, av, cfg_next);	TAILQ_INSERT_BEFORE(section, av, cfg_next);
CFG_RC_UNLOCK(cfg);	CFG_RC_UNLOCK(cfg);
}	}

if (csSec && *csSec) {	if (csSec && *csSec) {
AIT_SET_STR(&av->cfg_sec, csSec);	AIT_SET_STR(&av->cfg_sec, csSec);
AIT_KEY(&av->cfg_sec) = crcFletcher16(AIT_GET_LIKE(&av->cfg_sec, u_short*),	AIT_KEY(&av->cfg_sec) = crcFletcher16(AIT_GET_LIKE(&av->cfg_sec, u_short*),
io_align(AIT_LEN(&av->cfg_sec) - 1, 1) / 2);	E_ALIGN(AIT_LEN(&av->cfg_sec) - 1, 2) / 2);
}	}
AIT_SET_STR(&av->cfg_val, csVal);	AIT_SET_STR(&av->cfg_val, csVal ? csVal : "");
AIT_SET_STR(&av->cfg_attr, csAttr);	AIT_SET_STR(&av->cfg_attr, csAttr);
AIT_KEY(&av->cfg_attr) = crcFletcher16(AIT_GET_LIKE(&av->cfg_attr, u_short*),	AIT_KEY(&av->cfg_attr) = crcFletcher16(AIT_GET_LIKE(&av->cfg_attr, u_short*),
io_align(AIT_LEN(&av->cfg_attr) - 1, 1) / 2);	E_ALIGN(AIT_LEN(&av->cfg_attr) - 1, 2) / 2);

CFG_RC_LOCK(cfg);	CFG_RC_LOCK(cfg);
RB_INSERT(tagRC, cfg, av);	RB_INSERT(tagRC, cfg, av);
Line 222 cfg_setAttribute(cfg_root_t * __restrict cfg, const ch	Line 258 cfg_setAttribute(cfg_root_t * __restrict cfg, const ch
return 2;	return 2;
}	}

if (strcmp((char) csVal, (char) AIT_GET_STR(&av->cfg_val))) {	if (csVal && AIT_ADDR(&av->cfg_val) &&
	strcmp((char) csVal, (char) AIT_GET_STR(&av->cfg_val))) {
/* Update element */	/* Update element */
AIT_FREE_VAL(&av->cfg_val);	AIT_FREE_VAL(&av->cfg_val);
AIT_SET_STR(&av->cfg_val, csVal);	AIT_SET_STR(&av->cfg_val, csVal);
Line 238 cfg_setAttribute(cfg_root_t * __restrict cfg, const ch	Line 275 cfg_setAttribute(cfg_root_t * __restrict cfg, const ch
*	*
* @cfg = Config root	* @cfg = Config root
* @csSec = Config section //[{csSec}], if NULL unset in default section	* @csSec = Config section //[{csSec}], if NULL unset in default section
* @csAttr = Config attribute //{csAttr} = ..., if NULL unset as any attribute	* @csAttr = Config attribute //{csAttr} = ..., if NULL as any attribute
* return: NULL item not found or null parameters, !=NULL value const string	* return: NULL item not found or null parameters, !=NULL value const string
*/	*/
inline const char *	const char *
cfg_getAttribute(cfg_root_t * __restrict cfg, const char csSec, const char csAttr)	cfg_getAttribute(cfg_root_t * __restrict cfg, const char csSec, const char csAttr)
{	{
struct tagCfg *av;	struct tagCfg *av;

if (!cfg \|\| !csAttr)	if (!cfg)
return NULL;	return NULL;

av = _selectAttribute(cfg, csSec, csAttr);	av = _selectAttribute(cfg, csSec, csAttr);
Line 255 cfg_getAttribute(cfg_root_t * __restrict cfg, const ch	Line 292 cfg_getAttribute(cfg_root_t * __restrict cfg, const ch

return AIT_GET_STR(&av->cfg_val);	return AIT_GET_STR(&av->cfg_val);
}	}
#if 0
// --------------------------------------------------------------

/*	/*
* cfg_LoadAttribute() Extended get attribute, if not found item return default value	* cfg_getAttributeLong() - Get item as long from config and return value from it
* @cfg = Head list element	*
	* @cfg = Config root
* @csSec = Config section //[{csSec}], if NULL unset in default section	* @csSec = Config section //[{csSec}], if NULL unset in default section
* @csAttr = Config attribute //{csAttr} = ..., if NULL unset as any attribute	* @csAttr = Config attribute //{csAttr} = ..., if NULL as any attribute
* @psVal = Return buffer for item Value //... = {psVal}	* return: value
* @ValLen = Length of buffer //{psVal} for return	*/
* @csDefValue = Default Value for return in //{psVal}, if not found item in config list	long
* return: 0 item not found, -1 error: null parameters; >0 number of copied bytes in //{psVal}	cfg_getAttributeLong(cfg_root_t * __restrict cfg, const char csSec, const char csAttr)
*/
int cfg_LoadAttribute(sl_config * __restrict cfg, const u_char csSec, const u_char csAttr,
u_char * __restrict psVal, int ValLen, const char *csDefValue)
{	{
struct tagPair *av;	const char *str = NULL;

	str = cfg_getAttribute(cfg, csSec, csAttr);
	return strtol(str ? str : "", NULL, 0);
	}

	/*
	* cfg_getAttributeLLong() - Get item as long long from config and return value from it
	*
	* @cfg = Config root
	* @csSec = Config section //[{csSec}], if NULL unset in default section
	* @csAttr = Config attribute //{csAttr} = ..., if NULL as any attribute
	* return: value
	*/
	long long
	cfg_getAttributeLLong(cfg_root_t * __restrict cfg, const char csSec, const char csAttr)
	{
	const char *str = NULL;

	str = cfg_getAttribute(cfg, csSec, csAttr);
	return strtoll(str ? str : "", NULL, 0);
	}

	/*
	* cfg_getAttributeDouble() - Get item as double from config and return value from it
	*
	* @cfg = Config root
	* @csSec = Config section //[{csSec}], if NULL unset in default section
	* @csAttr = Config attribute //{csAttr} = ..., if NULL as any attribute
	* return: value
	*/
	double
	cfg_getAttributeDouble(cfg_root_t * __restrict cfg, const char csSec, const char csAttr)
	{
	const char *str = NULL;

	str = cfg_getAttribute(cfg, csSec, csAttr);
	return strtod(str ? str : "", NULL);
	}

	/*
	* cfg_getAttributeLDouble() - Get item as long double from config and return value from it
	*
	* @cfg = Config root
	* @csSec = Config section //[{csSec}], if NULL unset in default section
	* @csAttr = Config attribute //{csAttr} = ..., if NULL as any attribute
	* return: value
	*/
	long double
	cfg_getAttributeLDouble(cfg_root_t * __restrict cfg, const char csSec, const char csAttr)
	{
	const char *str = NULL;

	str = cfg_getAttribute(cfg, csSec, csAttr);
	return strtold(str ? str : "", NULL);
	}

	/*
	* cfg_loadAttribute() - Get guarded attribute, if not found item return default value
	*
	* @cfg = Config root
	* @csSec = Config section //[{csSec}], if NULL unset in default section
	* @csAttr = Config attribute //{csAttr} = ..., if NULL as any attribute
	* @val = Return buffer for item Value //... = {val}
	* @csDefValue = Default Value for return in //{val}, if not found item in config
	* return: 0 item not found, -1 error or >0 number of copied bytes in //{val}
	*/
	int
	cfg_loadAttribute(cfg_root_t * __restrict cfg, const char csSec, const char csAttr,
	ait_val_t * __restrict val, const char *csDefValue)
	{
	struct tagCfg *av;
int ret = 0;	int ret = 0;

if (!cfg \|\| !csAttr \|\| !ValLen \|\| !psVal)	if (!cfg \|\| !val) {
	cfg_SetErr(EINVAL, "Invalid argument(s)");
return -1;	return -1;
	}

av = SelectAttribute(cfg, csSec, csAttr);	AIT_INIT_VAL(val);
	av = _selectAttribute(cfg, csSec, csAttr);
if (!av) {	if (!av) {
	/* not found item */
if (csDefValue) {	if (csDefValue) {
strlcpy((char*) psVal, csDefValue, ValLen);	AIT_SET_STR(val, csDefValue);
ret = strlen((char*) psVal);	ret = AIT_LEN(val);
}	} else
	AIT_INIT_VAL(val);
return ret;	return ret;
}	}

if (!av->psValue \|\| !*av->psValue) {	if (AIT_ISEMPTY(&av->cfg_val) \|\| !AIT_ADDR(&av->cfg_val) \|\|
	!AIT_GET_LIKE(&av->cfg_val, char)) {
	/* empty value */
if (csDefValue) {	if (csDefValue) {
strlcpy((char*) psVal, csDefValue, ValLen);	AIT_SET_STR(val, csDefValue);
ret = strlen((char*) psVal);	ret = AIT_LEN(val);
}	} else
	AIT_INIT_VAL(val);
} else {	} else {
strlcpy((char) psVal, (char) av->psValue, ValLen);	/* copy value */
ret = strlen((char*) psVal);	AIT_SET_STR(val, AIT_GET_STR(&av->cfg_val));
	ret = AIT_LEN(val);
}	}

return ret;	return ret;
}	}
#endif

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

Removed from v.1.6.4.2
changed lines
	Added in v.1.15.2.1