libaitcfg/inc/aitcfg.h - diff

Return to aitcfg.h CVS log

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

Diff for /libaitcfg/inc/aitcfg.h between versions 1.6.4.1 and 1.7

version 1.6.4.1, 2012/04/02 14:39:02	version 1.7, 2012/04/04 13:11:49
Line 49 SUCH DAMAGE.	Line 49 SUCH DAMAGE.

#include <aitio.h>	#include <aitio.h>
#include <atree.h>	#include <atree.h>
	#include <pthread.h>


struct tagCfg {	struct tagCfg {
Line 60 struct tagCfg {	Line 61 struct tagCfg {
RB_ENTRY(tagCfg) cfg_node;	RB_ENTRY(tagCfg) cfg_node;
};	};
typedef struct tagRC {	typedef struct tagRC {
#ifdef HAVE_LIBPTHREAD
pthread_mutex_t rc_mtx;	pthread_mutex_t rc_mtx;
#endif
struct tagCfg *slh_first;	struct tagCfg *slh_first;
struct tagCfg *rbh_root;	struct tagCfg *rbh_root;
} cfg_root_t;	} cfg_root_t;
#ifdef HAVE_LIBPTHREAD
#define CFG_RC_LOCK(x) pthread_mutex_lock(&(x)->rc_mtx)	#define CFG_RC_LOCK(x) pthread_mutex_lock(&(x)->rc_mtx)
#define CFG_RC_UNLOCK(x) pthread_mutex_unlock(&(x)->rc_mtx)	#define CFG_RC_UNLOCK(x) pthread_mutex_unlock(&(x)->rc_mtx)
#else
#define CFG_RC_LOCK(x)
#define CFG_RC_UNLOCK(x)
#endif


// cfg_GetErrno() Get error code of last operation	// cfg_GetErrno() Get error code of last operation
Line 83 inline const char *cfg_GetError();	Line 78 inline const char *cfg_GetError();

/*	/*
* Macros for config library.	* Macros for config library.
*/	*/
#define CFG_ISEMPTY(x) RB_EMPTY((x))	#define CFG_ISEMPTY(x) RB_EMPTY((x))


/*	/*
	* cfgInitConfig() - Init config root
	*
	* @cfg = Config root
	* return: -1 error or 0 ok
	*/
	int cfgInitConfig(cfg_root_t * __restrict cfg);
	/*
* cfgLoadConfig() - Load config from file	* cfgLoadConfig() - Load config from file
*	*
* @cfgName = Config filename	* @cfgName = Config filename
Line 102 int cfgLoadConfig(const char cfgName, cfg_root_t __	Line 104 int cfgLoadConfig(const char cfgName, cfg_root_t __
* return: none	* return: none
*/	*/
void cfgUnloadConfig(cfg_root_t * __restrict cfg);	void cfgUnloadConfig(cfg_root_t * __restrict cfg);
	/*
	* cfgCreateConfig() - Create config file from memory
	*
	* @csConfigName = New config filename
	* @cfg = Config root
	* @whitespace = Additional whitespace characters to file
	* return: -1 error or 0 ok
	*/
	int cfgCreateConfig(const char csConfigName, cfg_root_t __restrict cfg,
	int whitespace);

/*	/*
* cfgReadConfig() - Read file and add new item at config root	* cfgReadConfig() - Read file and add new item at config root
Line 111 void cfgUnloadConfig(cfg_root_t * __restrict cfg);	Line 123 void cfgUnloadConfig(cfg_root_t * __restrict cfg);
* return: -1 error or 0 ok	* return: -1 error or 0 ok
*/	*/
int cfgReadConfig(FILE f, cfg_root_t __restrict cfg);	int cfgReadConfig(FILE f, cfg_root_t __restrict cfg);

#if 0
/*	/*
* cfg_CreateConfig() Create config file from memory without whitespaces!	* cfgWriteConfig() - Write config from memory
* @csConfigName = New config filename	*
* @cfg = Head list element	* @f = File handle
* return: 0 ok; -1 error:: can`t save new config	* @cfg = Config root
*/	* @whitespace = Additional whitespace characters to file
int cfg_CreateConfig(const char csConfigName, sl_config __restrict cfg);	* return: -1 error or 0 ok
	*/
	int cfgWriteConfig(FILE f, cfg_root_t __restrict cfg, int whitespace);
/*	/*
* CreateConfig() Create config file from memory	* cfgConcatConfig() - Concat two configs into one
* @csConfigName = New config filename	*
* @cfg = Head list element	* @cfg = Config root
* return: 0 ok; -1 error:: can`t save new config	* @add_cfg = Concated config will be destroy after merge
*/	* return: -1 error or 0 ok
int CreateConfig(const char csConfigName, sl_config __restrict cfg);	*/
	int cfgConcatConfig(cfg_root_t * __restrict cfg, cfg_root_t * __restrict add_cfg);

/*	/*
* WriteConfig() Write to file from items in config list	* cfgMergeConfig() - Marge two list in one cfg and destroy add_cfg
* @f = file resource	*
* @cfg = Head list element	* @cfg = Config root of main list
* return: 0 ok; -1 error:: can`t write to file	* @add_cfg = Merged config will be destroy after merge
*/	* return: -1 error or 0 ok
int WriteConfig(FILE f, sl_config __restrict cfg);	*/
	int cfgMergeConfig(cfg_root_t * __restrict cfg, cfg_root_t * __restrict add_cfg);

/*	/*
* cfg_WriteConfig() Write to file from items in config list without whitespaces!
* @f = file resource
* @cfg = Head list element
* return: 0 ok; -1 error:: can`t write to file
*/
int cfg_WriteConfig(FILE f, sl_config __restrict cfg);

/*
* ConcatConfig() Concat two list in one
* @cfg = Head list element of main list
* @add_cfg = Head list element of added list
* return: 0 ok; -1 error:: can`t concat lists
*/
int ConcatConfig(sl_config * __restrict cfg, sl_config * __restrict add_cfg);

/*
* MergeConfig() Marge two list in one cfg and destroy add_cfg
* @cfg = Head list element of main list
* @add_cfg = Head list element of merged list (destroy after all!)
* return: 0 ok; -1 error:: can`t merge lists
*/
int MergeConfig(sl_config * __restrict cfg, sl_config * __restrict add_cfg);
#endif

/*
* 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} = ...
* return: 0 not found item; -1 error: null parameters; >0 position in list	* return: 0 not found item, -1 error or >0 position in list
*/	*/
inline int cfg_findAttribute(cfg_root_t * __restrict cfg,	inline int cfg_findAttribute(cfg_root_t * __restrict cfg,
const char csSec, const char csAttr);	const char csSec, const char csAttr);
Line 178 inline int cfg_findAttribute(cfg_root_t * __restrict c	Line 165 inline int cfg_findAttribute(cfg_root_t * __restrict c
* @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 unset 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 cfg_getAttribute(cfg_root_t __restrict cfg,	inline const char cfg_getAttribute(cfg_root_t __restrict cfg,
const char csSec, const char csAttr);	const char csSec, const char csAttr);

#if 0
/*	/*
* cfg_SetAttribute() Set item in config list or add new item if not exists	* cfg_setAttribute() - Set item in config or adding new item if not exists
* @cfg = Head list element	*
	* @cfg = Config root
* @csSec = Config section //[{csSec}], if NULL set in default section	* @csSec = Config section //[{csSec}], if NULL set in default section
* @csAttr = Config attribute //{csAttr} = ..., if NULL set as any attribute	* @csAttr = Config attribute //{csAttr} = ...
* @csVal = Config value //... = {csVal} to setup	* @csVal = Config value //... = {csVal} to setup
* return: 0 nothing changed, -1 error: not enough memory; 1 find and update item; 2 added new item	* return: 0 nothing changed, -1 error, 1 found and updated item or 2 added new item
*/	*/
int cfg_SetAttribute(sl_config * __restrict cfg, const u_char csSec, const u_char csAttr, const u_char *csVal);	int cfg_setAttribute(cfg_root_t * __restrict cfg, const char *csSec,
	const char csAttr, const char csVal);
/*	/*
* 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} = ...
* 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);
* cfg_GetAttribute() Get item from config list and return his value
* @cfg = Head list element
* @csSec = Config section //[{csSec}], if NULL unset in default section
* @csAttr = Config attribute //{csAttr} = ..., if NULL unset as any attribute
* return: NULL item not found or null parameters; !=NULL value const string
*/
inline const u_char cfg_GetAttribute(sl_config __restrict cfg, const u_char csSec, const u_char csAttr);

/*	/*
* cfg_LoadAttribute() Extended get attribute, if not found item return default value	* cfg_loadAttribute() - Get guarded attribute, if not found item return default value
* @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} = ...
* @psVal = Return buffer for item Value //... = {psVal}	* @val = Return buffer for item Value //... = {val}
* @ValLen = Length of buffer //{psVal} for return	* @csDefValue = Default Value for return in //{val}, if not found item in config
* @csDefValue = Default Value for return in //{psVal}, if not found item in config list	* return: 0 item not found, -1 error or >0 number of copied bytes in //{val}
* return: 0 item not found, -1 error: null parameters; >0 number of copied bytes in //{psVal}	*/
*/	int cfg_loadAttribute(cfg_root_t * __restrict cfg, const char *csSec,
int cfg_LoadAttribute(sl_config * __restrict cfg, const u_char csSec, const u_char csAttr,	const char csAttr, ait_val_t __restrict val, const char *csDefValue);
u_char * __restrict psVal, int ValLen, const char *csDefValue);
#endif


#endif	#endif

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

Removed from v.1.6.4.1
changed lines
	Added in v.1.7