hugok
/
efl
forked from enlightenment/efl
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Mortens latest ecore_config update - fixes last breakage ;) 

SVN revision: 20419
This commit is contained in:
handyande 2006-02-12 21:08:36 +00:00 committed by handyande
parent 1ce159175b
commit 6e93eda95a
1 changed files with 14 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
legacy/ecore/src/lib/ecore_config/ecore_config_util.c
View File

@ -49,9 +49,9 @@ estring_disown(estring * e)
int
estring_appendf(estring * e, const char *fmt, ...)
{
int need;
va_list ap;
char *p;
int need;
va_list ap;
char *p;
if (!e)
return ECORE_CONFIG_ERR_FAIL;
@ -59,35 +59,31 @@ estring_appendf(estring * e, const char *fmt, ...)
if (!e->str)
{
e->used = e->alloc = 0;
if (!(e->str = (char *)malloc(e->alloc = 512)))
if (!(e->str = (char *)malloc(e->alloc = CHUNKLEN)))
return ECORE_CONFIG_ERR_OOM;
}
retry:
va_start(ap, fmt);
need = vsnprintf(e->str + e->used, e->alloc - e->used, fmt, ap);
need = vsnprintf(NULL, 0, fmt, ap);
va_end(ap);
if ((need >= (e->alloc - e->used)) || (need < 0))
if (need >= (e->alloc - e->used))
{
if (need < 0)
need = 2 * e->alloc;
else
need++;
need += e->used;
need += (CHUNKLEN - (need % CHUNKLEN));
e->alloc = e->used + need + (CHUNKLEN - (need % CHUNKLEN));
if (!(p = (char *)realloc(e->str, need)))
{
if (!(p = (char *)realloc(e->str, e->alloc)))
{
free(e->str);
e->alloc = e->used = 0;
return ECORE_CONFIG_ERR_OOM;
}
e->alloc = need;
}
e->str = p;
goto retry;
}
va_start(ap, fmt);
need = vsnprintf(e->str + e->used, e->alloc - e->used, fmt, ap);
va_end(ap);
return e->used += need;
}