libaitio/src/aitio.c - diff

Return to aitio.c CVS log

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

Diff for /libaitio/src/aitio.c between versions 1.10.6.4 and 1.12.6.1

version 1.10.6.4, 2012/05/23 13:53:00	version 1.12.6.1, 2012/11/15 23:18:33
Line 105 io_mm_inuse()	Line 105 io_mm_inuse()


// init libaitio routine	// init libaitio routine
void	__attribute__((constructor)) void
_init()	_io_init()
{	{
#ifdef USE_MPOOL
ioLibInit(IO_MPOOL, 0);	ioLibInit(IO_MPOOL, 0);
#else
ioLibInit(IO_SYSM, 0);
#endif
}	}

// fini libaitio routine	// fini libaitio routine
void	__attribute__((destructor)) void
_fini()	_io_fini()
{	{
ioLibFini();	ioLibFini();
}	}
Line 171 inline void	Line 167 inline void
ioLibFini()	ioLibFini()
{	{
switch (use_mm) {	switch (use_mm) {
case 1:	case IO_MPOOL:
mpool_destroy(&io_mpool);

io_malloc = malloc;	io_malloc = malloc;
io_calloc = calloc;	io_calloc = calloc;
io_realloc = realloc;	io_realloc = realloc;
io_strdup = strdup;	io_strdup = strdup;
io_free = free;	io_free = free;
use_mm = IO_SYSM;	use_mm = IO_SYSM;

	mpool_destroy(&io_mpool);
break;	break;
}	}
}	}
Line 412 ioRegexGet(const char csRegex, const char csData, ch	Line 408 ioRegexGet(const char csRegex, const char csData, ch
* @csRegex = Regulare expression pattern	* @csRegex = Regulare expression pattern
* @csData = Source data	* @csData = Source data
* @csNew = Data for replace	* @csNew = Data for replace
* return: NULL not match or error; !=NULL allocated new string, must be xfree after use!	* return: NULL not match or error; !=NULL allocated new string, must be io_free after use!
*/	*/
char *	char *
ioRegexReplace(const char csRegex, const char csData, const char *csNew)	ioRegexReplace(const char csRegex, const char csData, const char *csNew)
Line 428 ioRegexReplace(const char csRegex, const char csData	Line 424 ioRegexReplace(const char csRegex, const char csData

// ___ before match	// ___ before match
len = sp + 1;	len = sp + 1;
str = xmalloc(len);	str = io_malloc(len);
if (!str) {	if (!str) {
LOGERR;	LOGERR;
return NULL;	return NULL;
Line 437 ioRegexReplace(const char csRegex, const char csData	Line 433 ioRegexReplace(const char csRegex, const char csData
// * replace match *	// * replace match *
if (csNew) {	if (csNew) {
len += strlen(csNew);	len += strlen(csNew);
str = xrealloc(str, len);	str = io_realloc(str, len);
if (!str) {	if (!str) {
LOGERR;	LOGERR;
return NULL;	return NULL;
Line 446 ioRegexReplace(const char csRegex, const char csData	Line 442 ioRegexReplace(const char csRegex, const char csData
}	}
// after match ___	// after match ___
len += strlen(csData) - ep;	len += strlen(csData) - ep;
str = xrealloc(str, len);	str = io_realloc(str, len);
if (!str) {	if (!str) {
LOGERR;	LOGERR;
return NULL;	return NULL;
Line 460 ioRegexReplace(const char csRegex, const char csData	Line 456 ioRegexReplace(const char csRegex, const char csData
* ioStrAst() - Function for evaluate string like asterisk variable "{text[:[-]#[:#]]}"	* ioStrAst() - Function for evaluate string like asterisk variable "{text[:[-]#[:#]]}"
*	*
* @csString = Input string	* @csString = Input string
* return: NULL error, !=NULL Allocated new string evaluated from input string, must be xfree()	* return: NULL error, !=NULL Allocated new string evaluated from input string, must be io_free()
*/	*/
char *	char *
ioStrAst(const char *csString)	ioStrAst(const char *csString)
Line 478 ioStrAst(const char *csString)	Line 474 ioStrAst(const char *csString)
io_Errno = EINVAL;	io_Errno = EINVAL;
return NULL;	return NULL;
} else {	} else {
str = strdup(strchr(csString, '{') + 1);	str = io_strdup(strchr(csString, '{') + 1);
*strrchr(str, '}') = 0;	*strrchr(str, '}') = 0;
}	}

Line 500 ioStrAst(const char *csString)	Line 496 ioStrAst(const char *csString)
/* ok, clear show */	/* ok, clear show */
ext = str;	ext = str;

out = strdup(ext);	out = io_strdup(ext);
xfree(str);	io_free(str);

return out;	return out;
}	}
Line 523 ioMkDir(const char *csDir, int mode)	Line 519 ioMkDir(const char *csDir, int mode)
if (!csDir)	if (!csDir)
return cx;	return cx;

str = strdup(csDir);	str = io_strdup(csDir);
if (!str) {	if (!str) {
LOGERR;	LOGERR;
return cx;	return cx;
Line 551 ioMkDir(const char *csDir, int mode)	Line 547 ioMkDir(const char *csDir, int mode)
}	}
end:	end:
chdir(szOld);	chdir(szOld);
xfree(str);	io_free(str);
return cx;	return cx;
}	}

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

Removed from v.1.10.6.4
changed lines
	Added in v.1.12.6.1