diff options
| author | Carsten Haitzler (Rasterman) <raster@rasterman.com> | 2018-11-08 16:34:16 +0000 |
|---|---|---|
| committer | Carsten Haitzler (Rasterman) <raster@rasterman.com> | 2018-11-09 12:18:59 +0000 |
| commit | 5641910ed24e1037d347ad991abdef328424b1ca (patch) | |
| tree | 1f46d3e90a79e6c86fe0c59dee7bcfeb6bbd0ceb | |
| parent | db3fe9b03f295ee36502052d82057e867afc39df (diff) | |
| download | efl-5641910ed24e1037d347ad991abdef328424b1ca.tar.gz | |
edje entry - be clearer and more efficient on string appending
using strncpy with strlen of the string you append is pointless.
again... strcpy will do - but use memcpy to be exact and pre-compute
sizing etc. only once. fixes warnings.
| -rw-r--r-- | src/lib/edje/edje_entry.c | 30 |
1 files changed, 17 insertions, 13 deletions
diff --git a/src/lib/edje/edje_entry.c b/src/lib/edje/edje_entry.c index 1ad3c30b65..da0bc81674 100644 --- a/src/lib/edje/edje_entry.c +++ b/src/lib/edje/edje_entry.c @@ -361,6 +361,7 @@ _text_filter_format_prepend(Edje *ed, Entry *en, Evas_Textblock_Cursor *c, const if (text2) { char *s, *markup_text; + size_t size; s = text2; if (*s == '+') @@ -373,13 +374,14 @@ _text_filter_format_prepend(Edje *ed, Entry *en, Evas_Textblock_Cursor *c, const free(text2); return; } - markup_text = (char *)malloc(strlen(s) + 3); + size = strlen(s); + markup_text = (char *)malloc(size + 3); if (markup_text) { *(markup_text) = '<'; - strncpy((markup_text + 1), s, strlen(s)); - *(markup_text + strlen(s) + 1) = '>'; - *(markup_text + strlen(s) + 2) = '\0'; + memcpy((markup_text + 1), s, size); + *(markup_text + size + 1) = '>'; + *(markup_text + size + 2) = '\0'; } } else if (s[0] == '-') @@ -392,26 +394,28 @@ _text_filter_format_prepend(Edje *ed, Entry *en, Evas_Textblock_Cursor *c, const free(text2); return; } - markup_text = (char *)malloc(strlen(s) + 4); + size = strlen(s); + markup_text = (char *)malloc(size + 4); if (markup_text) { *(markup_text) = '<'; *(markup_text + 1) = '/'; - strncpy((markup_text + 2), s, strlen(s)); - *(markup_text + strlen(s) + 2) = '>'; - *(markup_text + strlen(s) + 3) = '\0'; + memcpy((markup_text + 2), s, size); + *(markup_text + size + 2) = '>'; + *(markup_text + size + 3) = '\0'; } } else { - markup_text = (char *)malloc(strlen(s) + 4); + size = strlen(s); + markup_text = (char *)malloc(size + 4); if (markup_text) { *(markup_text) = '<'; - strncpy((markup_text + 1), s, strlen(s)); - *(markup_text + strlen(s) + 1) = '/'; - *(markup_text + strlen(s) + 2) = '>'; - *(markup_text + strlen(s) + 3) = '\0'; + memcpy((markup_text + 1), s, size); + *(markup_text + size + 1) = '/'; + *(markup_text + size + 2) = '>'; + *(markup_text + size + 3) = '\0'; } } free(text2); |