From 8358354e097be4d8d3ba65405b6d43bb0c53cd5c Mon Sep 17 00:00:00 2001 From: Vincent Torri Date: Tue, 23 Mar 2010 05:45:35 +0000 Subject: [PATCH] * declare variables at the beginning of the block * minor formatting SVN revision: 47383 --- legacy/eina/src/lib/eina_strbuf.c | 18 ++++++++++-------- 1 file changed, 10 insertions(+), 8 deletions(-) diff --git a/legacy/eina/src/lib/eina_strbuf.c b/legacy/eina/src/lib/eina_strbuf.c index b4c6e1a1de..91a128aec7 100644 --- a/legacy/eina/src/lib/eina_strbuf.c +++ b/legacy/eina/src/lib/eina_strbuf.c @@ -293,6 +293,7 @@ eina_strbuf_free(Eina_Strbuf *buf) { EINA_MAGIC_CHECK_STRBUF(buf); EINA_MAGIC_SET(buf, EINA_MAGIC_NONE); + free(buf->buf); free(buf); } @@ -708,6 +709,7 @@ EAPI char * eina_strbuf_string_steal(Eina_Strbuf *buf) { char *ret; + EINA_MAGIC_CHECK_STRBUF(buf, NULL); ret = buf->buf; @@ -747,14 +749,14 @@ eina_strbuf_length_get(const Eina_Strbuf *buf) EAPI Eina_Bool eina_strbuf_replace(Eina_Strbuf *buf, const char *str, const char *with, unsigned int n) { - EINA_SAFETY_ON_NULL_RETURN_VAL(str, EINA_FALSE); - EINA_SAFETY_ON_NULL_RETURN_VAL(with, EINA_FALSE); - EINA_MAGIC_CHECK_STRBUF(buf, 0); - size_t len1, len2; char *spos; size_t pos; + EINA_SAFETY_ON_NULL_RETURN_VAL(str, EINA_FALSE); + EINA_SAFETY_ON_NULL_RETURN_VAL(with, EINA_FALSE); + EINA_MAGIC_CHECK_STRBUF(buf, 0); + if (n == 0) return EINA_FALSE; @@ -802,10 +804,6 @@ eina_strbuf_replace(Eina_Strbuf *buf, const char *str, const char *with, unsigne EAPI int eina_strbuf_replace_all(Eina_Strbuf *buf, const char *str, const char *with) { - EINA_SAFETY_ON_NULL_RETURN_VAL(str, 0); - EINA_SAFETY_ON_NULL_RETURN_VAL(with, 0); - EINA_MAGIC_CHECK_STRBUF(buf, 0); - size_t len1, len2, len; char *tmp_buf = NULL; char *spos; @@ -813,6 +811,10 @@ eina_strbuf_replace_all(Eina_Strbuf *buf, const char *str, const char *with) size_t pos_tmp, start_tmp; int n = 0; + EINA_SAFETY_ON_NULL_RETURN_VAL(str, 0); + EINA_SAFETY_ON_NULL_RETURN_VAL(with, 0); + EINA_MAGIC_CHECK_STRBUF(buf, 0); + spos = strstr(buf->buf, str); if (!spos || *spos == '\0') return 0;