enlightenment/efl
enlightenment
/
efl
8
7
Fork 14
Code Issues 13 Pull Requests 6 Projects Releases Wiki Activity

Add functions to match evas strbuf 

SVN revision: 45943
This commit is contained in:
Sebastian Dransfeld 2010-02-06 20:41:43 +00:00
parent ac60497dbf
commit 4a1ac380b1
2 changed files with 85 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
legacy/eina/src/include/eina_strbuf.h
View File

@ -10,11 +10,14 @@ typedef struct _Eina_Strbuf Eina_Strbuf;
EAPI Eina_Strbuf *eina_strbuf_new(void);
EAPI void eina_strbuf_free(Eina_Strbuf *buf) EINA_ARG_NONNULL(1);
EAPI void eina_strbuf_append(Eina_Strbuf *buf, const char *str) EINA_ARG_NONNULL(1, 2);
EAPI void eina_strbuf_append_n(Eina_Strbuf *buf, const char *str, unsigned int maxlen) EINA_ARG_NONNULL(1, 2);
EAPI void eina_strbuf_append_char(Eina_Strbuf *buf, char c) EINA_ARG_NONNULL(1);
EAPI void eina_strbuf_insert(Eina_Strbuf *buf, const char *str,
size_t pos) EINA_ARG_NONNULL(1, 2);
#define eina_strbuf_prepend(buf, str) eina_strbuf_insert(buf, str, 0)
EAPI void eina_strbuf_remove(Eina_Strbuf *buf, unsigned int start, unsigned int end) EINA_ARG_NONNULL(1);
EAPI const char *eina_strbuf_string_get(Eina_Strbuf *buf) EINA_ARG_NONNULL(1);
EAPI char *eina_strbuf_string_remove(Eina_Strbuf *buf) EINA_ARG_NONNULL(1);
EAPI size_t eina_strbuf_length_get(Eina_Strbuf *buf) EINA_ARG_NONNULL(1);
EAPI int eina_strbuf_replace(Eina_Strbuf *buf, const char *str,
const char *with, unsigned int n) EINA_ARG_NONNULL(1, 2, 3);

113
legacy/eina/src/lib/eina_strbuf.c
View File

@ -40,6 +40,7 @@ struct _Eina_Strbuf
EINA_MAGIC
};
static void _eina_strbuf_init(Eina_Strbuf *buf);
static int _eina_strbuf_resize(Eina_Strbuf *buf, size_t size);
Eina_Bool
@ -67,12 +68,7 @@ eina_strbuf_new(void)
if (!buf) return NULL;
EINA_MAGIC_SET(buf, EINA_MAGIC_STRBUF);
buf->len = 0;
buf->size = EINA_STRBUF_INIT_SIZE;
buf->step = EINA_STRBUF_INIT_STEP;
buf->buf = malloc(buf->size);
buf->buf[0] = '\0';
_eina_strbuf_init(buf);
return buf;
}
@ -97,27 +93,35 @@ eina_strbuf_free(Eina_Strbuf *buf)
EAPI void
eina_strbuf_append(Eina_Strbuf *buf, const char *str)
{
size_t l;
size_t off = 0;
size_t len;
EINA_MAGIC_CHECK_STRBUF(buf);
len = strlen(str);
_eina_strbuf_resize(buf, buf->len + len + 1);
eina_strlcpy(buf->buf + buf->len, str, buf->size - buf->len);
buf->len += len;
}
/**
* Append a string to a buffer, reallocating as necessary. Limited by maxlen.
* @param buf the Eina_Strbuf to append to
* @param str the string to append
* @param maxlen maximum number of chars to append
*/
EAPI void
eina_strbuf_append_n(Eina_Strbuf *buf, const char *str, unsigned int maxlen)
{
size_t len;
EINA_MAGIC_CHECK_STRBUF(buf);
l = eina_strlcpy(buf->buf + buf->len, str, buf->size - buf->len);
len = strlen(str);
if (len > maxlen) len = maxlen;
len += 1; // for '\0'
_eina_strbuf_resize(buf, buf->len + len);
while (l > buf->size - buf->len)
{
/* we successfully appended this much */
off += buf->size - buf->len - 1;
buf->len = buf->size - 1;
buf->size += buf->step;
if (buf->step < EINA_STRBUF_MAX_STEP)
buf->step *= 2;
buf->buf = realloc(buf->buf, buf->size);
*(buf->buf + buf->len) = '\0';
l = eina_strlcpy(buf->buf + buf->len, str + off, buf->size - buf->len);
}
buf->len += l;
eina_strlcpy(buf->buf + buf->len, str, len);
buf->len += len;
}
/**
@ -163,18 +167,36 @@ eina_strbuf_append_char(Eina_Strbuf *buf, char c)
{
EINA_MAGIC_CHECK_STRBUF(buf);
if (buf->len >= buf->size - 1)
{
buf->size += buf->step;
if (buf->step < EINA_STRBUF_MAX_STEP)
buf->step *= 2;
buf->buf = realloc(buf->buf, buf->size);
}
_eina_strbuf_resize(buf, buf->len + 1);
buf->buf[(buf->len)++] = c;
buf->buf[buf->len] = '\0';
}
EAPI void
eina_strbuf_remove(Eina_Strbuf *buf, unsigned int start, unsigned int end)
{
unsigned int remove_len, tail_len;
EINA_MAGIC_CHECK_STRBUF(buf);
if (end >= buf->len)
end = buf->len;
if (end <= start) return;
remove_len = end - start;
if (remove_len == buf->len)
{
free(buf->buf);
_eina_strbuf_init(buf);
return;
}
tail_len = buf->len - end + 1; /* includes '\0' */
memmove(buf->buf + start, buf->buf + end, tail_len);
buf->len -= remove_len;
}
/**
* Retrieve a pointer to the contents of a string buffer
* @param buf the buffer
@ -190,6 +212,21 @@ eina_strbuf_string_get(Eina_Strbuf *buf)
return buf->buf;
}
/**
* Remove the contents of a string buffer
* @param buf the buffer
*/
EAPI char *
eina_strbuf_string_remove(Eina_Strbuf *buf)
{
char *ret;
EINA_MAGIC_CHECK_STRBUF(buf, NULL);
ret = buf->buf;
_eina_strbuf_init(buf);
return ret;
}
/**
* Retrieve the length of the string buffer content
* @param buf the buffer
@ -342,6 +379,20 @@ eina_strbuf_replace_all(Eina_Strbuf *buf, const char *str, const char *with)
return n;
}
/**
* init the buffer
* @param buf the buffer to init
*/
static void
_eina_strbuf_init(Eina_Strbuf *buf)
{
buf->len = 0;
buf->size = EINA_STRBUF_INIT_SIZE;
buf->step = EINA_STRBUF_INIT_STEP;
buf->buf = malloc(buf->size);
buf->buf[0] = '\0';
}
/**
* resize the buffer