hyung-hwan/qse
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

removed ase_str_forfeit() and added ase_str_yield()

Browse Source
This commit is contained in:
hyung-hwan
2008-09-01 04:55:59 +00:00
parent 91159085ed
commit ae2f49f1a1
2 changed files with 88 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

59
ase/lib/cmn/str_dyn.c
View File

@ -1,5 +1,5 @@
/*
* $Id: str_dyn.c 350 2008-08-29 14:51:04Z baconevi $
* $Id: str_dyn.c 352 2008-08-31 10:55:59Z baconevi $
*
* {License}
*/
@ -34,20 +34,51 @@ ase_str_t* ase_str_init (ase_str_t* str, ase_mmgr_t* mmgr, ase_size_t capa)
ASE_MEMSET (str, 0, sizeof(ase_str_t));
str->mmgr = mmgr;
str->buf = (ase_char_t*) ASE_MMGR_ALLOC (
mmgr, sizeof(ase_char_t) * (capa + 1));
if (str->buf == ASE_NULL) return ASE_NULL;
if (capa == 0) str->buf = ASE_NULL;
else
{
str->buf = (ase_char_t*) ASE_MMGR_ALLOC (
mmgr, sizeof(ase_char_t) * (capa + 1));
if (str->buf == ASE_NULL) return ASE_NULL;
str->buf[0] = ASE_T('\0');
}
str->size = 0;
str->capa = capa;
str->buf[0] = ASE_T('\0');
str->capa = capa;
return str;
}
void ase_str_fini (ase_str_t* str)
{
ASE_MMGR_FREE (str->mmgr, str->buf);
if (str->buf != ASE_NULL) ASE_MMGR_FREE (str->mmgr, str->buf);
}
int ase_str_yield (ase_str_t* str, ase_cstr_t* buf, int new_capa)
{
ase_char_t* tmp;
if (new_capa == 0) tmp = ASE_NULL;
else
{
tmp = (ase_char_t*) ASE_MMGR_ALLOC (
str->mmgr, sizeof(ase_char_t) * (new_capa + 1));
if (tmp == ASE_NULL) return -1;
tmp[0] = ASE_T('\0');
}
if (buf != ASE_NULL)
{
buf->ptr = str->buf;
buf->len = str->size;
}
str->buf = tmp;
str->size = 0;
str->capa = new_capa;
return 0;
}
void ase_str_clear (ase_str_t* str)
@ -56,12 +87,6 @@ void ase_str_clear (ase_str_t* str)
str->buf[0] = ASE_T('\0');
}
void ase_str_forfeit (ase_str_t* str)
{
// TODO: how to handle this??????????????????????
if (str->__dynamic) ASE_MMGR_FREE (str->mmgr, str);
}
void ase_str_swap (ase_str_t* str, ase_str_t* str1)
{
ase_str_t tmp;
@ -92,13 +117,13 @@ ase_size_t ase_str_ncpy (ase_str_t* str, const ase_char_t* s, ase_size_t len)
{
ase_char_t* buf;
if (len > str->capa)
if (len > str->capa || str->buf == ASE_NULL)
{
buf = (ase_char_t*) ASE_MMGR_ALLOC (
str->mmgr, sizeof(ase_char_t) * (len + 1));
if (buf == ASE_NULL) return (ase_size_t)-1;
ASE_MMGR_FREE (str->mmgr, str->buf);
if (str->buf != ASE_NULL) ASE_MMGR_FREE (str->mmgr, str->buf);
str->capa = len;
str->buf = buf;
}
@ -126,11 +151,11 @@ ase_size_t ase_str_ncat (ase_str_t* str, const ase_char_t* s, ase_size_t len)
/* double the capa if necessary for concatenation */
if (capa < str->capa * 2) capa = str->capa * 2;
if (str->mmgr->realloc != ASE_NULL)
if (str->mmgr->realloc != ASE_NULL && str->buf != ASE_NULL)
{
tmp = (ase_char_t*) ASE_REALLOC (
str->mmgr, str->buf,
sizeof(ase_char_t) * (capa + 1));
sizeof(ase_char_t)*(capa+1));
if (tmp == ASE_NULL) return (ase_size_t)-1;
}
else