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.12 and 1.19

version 1.12, 2013/05/30 09:12:27	version 1.19, 2021/11/26 01:15:03
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, 2013	Copyright 2004 - 2021
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, *c;	struct tagCfg fav, c, n;

if (!cfg)	if (!cfg)
return NULL;	return NULL;
Line 63 _selectAttribute(cfg_root_t * __restrict cfg, const ch	Line 63 _selectAttribute(cfg_root_t * __restrict cfg, const ch
AIT_KEY(&fav.cfg_attr) = crcFletcher16((u_short*) csAttr,	AIT_KEY(&fav.cfg_attr) = crcFletcher16((u_short*) csAttr,
E_ALIGN(strlen(csAttr), 2) / 2);	E_ALIGN(strlen(csAttr), 2) / 2);

if (!csAttr)	if (!csAttr) {
return RB_NFIND(tagRC, cfg, &fav);	c = RB_NFIND(tagRC, cfg, &fav);
else {	if (!c)
	return NULL; /* not found */
	if (csSec && !AIT_ISEMPTY(&c->cfg_sec) &&
	strcmp(csSec, AIT_GET_STR(&c->cfg_sec)))
	TAILQ_FOREACH_SAFE(c, cfg, cfg_next, n) {
	if (!AIT_ISEMPTY(&c->cfg_sec) &&
	!strcmp(csSec, AIT_GET_STR(&c->cfg_sec)))
	break;
	}
	return c;
	} else {
c = RB_FIND(tagRC, cfg, &fav);	c = RB_FIND(tagRC, cfg, &fav);
if (!c)	if (!c)
return NULL; /* not found */	return NULL; /* not found */
	/* if cannot find right section */
	if (csSec && !AIT_ISEMPTY(&c->cfg_sec) &&
	strcmp(csSec, AIT_GET_STR(&c->cfg_sec))) {
	TAILQ_FOREACH_SAFE(c, cfg, cfg_next, n) {
	if (!AIT_ISEMPTY(&c->cfg_sec) && csAttr &&
	!strcmp(csSec, AIT_GET_STR(&c->cfg_sec)) &&
	!strcmp(csAttr, AIT_GET_STR(&c->cfg_attr)))
	return c; /* FOUND! */
	}
	return NULL; /* not found */
	}
do {	do {
if (!strcmp(AIT_GET_STR(&c->cfg_attr), csAttr))	if (!strcmp(AIT_GET_STR(&c->cfg_attr), csAttr))
return c; /* FOUND! */	return c; /* FOUND! */
} while (RB_NEXT(tagRC, cfg, c) && !cfg_tree_cmp(c, &fav));	} while ((c = RB_NEXT(tagRC, cfg, c)) && c && !cfg_tree_cmp(c, &fav));
	/* if cannot find right attribute */
	TAILQ_FOREACH_SAFE(c, cfg, cfg_next, n) {
	if ((!csSec && AIT_ISEMPTY(&c->cfg_sec)) \|\|
	(csSec && !AIT_ISEMPTY(&c->cfg_sec) &&
	!strcmp(csSec, AIT_GET_STR(&c->cfg_sec))))
	if (!AIT_ISEMPTY(&c->cfg_attr) && csAttr &&
	!strcmp(csAttr, AIT_GET_STR(&c->cfg_attr)))
	return c; /* FOUND! */
	}
return NULL; /* not found */	return NULL; /* not found */
}	}
}	}
Line 80 _selectAttribute(cfg_root_t * __restrict cfg, const ch	Line 110 _selectAttribute(cfg_root_t * __restrict cfg, const ch
/* --------------------------------------------------------------- */	/* --------------------------------------------------------------- */

/*	/*
* cfg_findAttribute() - Find attribute position in config file	* cfg_dumpCfg() - dump config data
*	*
* @cfg = Config root	* @cfg = Config root
	* return: none
	*/
	void
	cfg_dumpCfg(cfg_root_t * __restrict cfg)
	{
	struct tagCfg r, c, ctmp, q, *qtmp;
	int syn;

	r = RB_ROOT(cfg);
	printf("ROOT:: KEY=%.8x [%s] %s=%s\n", ((AIT_KEY(&r->cfg_sec) << 15) \| AIT_KEY(&r->cfg_attr)),
	AIT_ADDR(&r->cfg_sec), AIT_ADDR(&r->cfg_attr), AIT_ADDR(&r->cfg_val));

	RB_FOREACH_SAFE(c, tagRC, cfg, ctmp) {
	syn ^= syn;
	TAILQ_FOREACH_SAFE(q, cfg, cfg_next, qtmp) {
	if (c == q) {
	syn = 42;
	break;
	}
	}

	printf("%s KEY=%.8x [%s] %s=%s sync=%d\n", c == r ? "*" : "",
	((AIT_KEY(&c->cfg_sec) << 15) \| AIT_KEY(&c->cfg_attr)),
	AIT_ADDR(&c->cfg_sec), AIT_ADDR(&c->cfg_attr), AIT_ADDR(&c->cfg_val), syn);
	}
	}

	/*
	* cfg_getSection() - Get entire section attributes into array
	*
	* @cfg = Config root
* @csSec = Config section //[{csSec}]	* @csSec = Config section //[{csSec}]
* @csAttr = Config attribute //{csAttr} = ...	* return: NULL not found or !=NULL allocated array, must free with array_Destroy() after use!
* return: 0 not found item, -1 error or >0 position in list
*/	*/
int	array_t *
cfg_findAttribute(cfg_root_t * __restrict cfg, const char csSec, const char csAttr)	cfg_getSection(cfg_root_t * __restrict cfg, const char *csSec)
{	{
	array_t *arr = NULL;
struct tagCfg *av, fav;	struct tagCfg *av, fav;
register int cx = 0;

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

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

SLIST_FOREACH(av, cfg, cfg_next) {	arr = array_Init(0);
	if (!arr) {
	cfg_SetErr(elwix_GetErrno(), "%s", elwix_GetError());
	return NULL;
	}

	TAILQ_FOREACH(av, cfg, cfg_next)
	if (AIT_KEY(&av->cfg_sec) == AIT_KEY(&fav.cfg_sec)) {
	if (!csSec) {
	if (AIT_ISEMPTY(&av->cfg_sec))
	array_Push(arr, av, 0);
	} else {
	if (!AIT_ISEMPTY(&av->cfg_sec) &&
	!strcmp(AIT_GET_STR(&av->cfg_sec), csSec))
	array_Push(arr, av, 0);
	}
	}

	if (!array_Size(arr))
	array_Destroy(&arr);

	return arr;
	}

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

	if (!cfg) {
	cfg_SetErr(EINVAL, "Invalid argument(s)");
	return -1;
	}

	TAILQ_FOREACH_SAFE(av, cfg, cfg_next, n) {
++cx;	++cx;
if (!cfg_tree_cmp(&fav, av))
return cx;	if ((!csSec && AIT_ISEMPTY(&av->cfg_sec)) \|\|
	(csSec && !AIT_ISEMPTY(&av->cfg_sec) &&
	!strcmp(csSec, AIT_GET_STR(&av->cfg_sec))))
	if (!AIT_ISEMPTY(&av->cfg_attr) && csAttr &&
	!strcmp(csAttr, AIT_GET_STR(&av->cfg_attr)))
	return cx;
}	}

return 0;	return 0;
Line 128 cfg_unsetAttribute(cfg_root_t * __restrict cfg, const	Line 235 cfg_unsetAttribute(cfg_root_t * __restrict cfg, const
{	{
struct tagCfg *av;	struct tagCfg *av;

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

av = _selectAttribute(cfg, csSec, csAttr);	av = _selectAttribute(cfg, csSec, csAttr);
Line 137 cfg_unsetAttribute(cfg_root_t * __restrict cfg, const	Line 244 cfg_unsetAttribute(cfg_root_t * __restrict cfg, const

CFG_RC_LOCK(cfg);	CFG_RC_LOCK(cfg);
RB_REMOVE(tagRC, cfg, av);	RB_REMOVE(tagRC, cfg, av);
SLIST_REMOVE(cfg, av, tagCfg, cfg_next);	TAILQ_REMOVE(cfg, av, cfg_next);
CFG_RC_UNLOCK(cfg);	CFG_RC_UNLOCK(cfg);

AIT_FREE_VAL(&av->cfg_val);	AIT_FREE_VAL(&av->cfg_val);
Line 178 cfg_setAttribute(cfg_root_t * __restrict cfg, const ch	Line 285 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);
}	}

Line 217 cfg_setAttribute(cfg_root_t * __restrict cfg, const ch	Line 324 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} = ...
* return: NULL item not found or null parameters, !=NULL value const string	* return: NULL item not found or null parameters, !=NULL value const string
*/	*/
const char *	const char *
Line 225 cfg_getAttribute(cfg_root_t * __restrict cfg, const ch	Line 332 cfg_getAttribute(cfg_root_t * __restrict cfg, const ch
{	{
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 236 cfg_getAttribute(cfg_root_t * __restrict cfg, const ch	Line 343 cfg_getAttribute(cfg_root_t * __restrict cfg, const ch
}	}

/*	/*
	* cfg_getAttributeLong() - Get item as 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} = ...
	* return: value
	*/
	long
	cfg_getAttributeLong(cfg_root_t * __restrict cfg, const char csSec, const char csAttr)
	{
	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} = ...
	* 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} = ...
	* 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} = ...
	* 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_loadAttribute() - Get guarded attribute, if not found item return default value
*	*
* @cfg = Config root	* @cfg = Config root
Line 252 cfg_loadAttribute(cfg_root_t * __restrict cfg, const c	Line 427 cfg_loadAttribute(cfg_root_t * __restrict cfg, const c
struct tagCfg *av;	struct tagCfg *av;
int ret = 0;	int ret = 0;

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

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

Removed from v.1.12
changed lines
	Added in v.1.19