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

warning about shadowing symbols! BEGONE! 

SVN revision: 61919
This commit is contained in:
Iván Briano 2011-07-30 03:19:44 +00:00
parent 3319b7310f
commit 5e7fe97a1e
1 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
legacy/elementary/src/lib/elm_entry.c
View File

@ -1804,20 +1804,20 @@ _add_chars_till_limit(Evas_Object *obj, char **text, int can_add, Length_Unit un
} }
else else
{ {
int index = 0; int idx = 0;
if (*new_text == '&') if (*new_text == '&')
{ {
while (*(new_text + index) != ';') while (*(new_text + idx) != ';')
{ {
index++; idx++;
if (!*(new_text + index)) break; if (!*(new_text + idx)) break;
} }
} }
char *markup; char *markup;
index = evas_string_char_next_get(new_text, index, NULL); idx = evas_string_char_next_get(new_text, idx, NULL);
markup = malloc(index + 1); markup = malloc(idx + 1);
strncpy(markup, new_text, index); strncpy(markup, new_text, idx);
markup[index] = 0; markup[idx] = 0;
if (unit == LENGTH_UNIT_BYTE) if (unit == LENGTH_UNIT_BYTE)
unit_size = strlen(elm_entry_markup_to_utf8(markup)); unit_size = strlen(elm_entry_markup_to_utf8(markup));
else if (unit == LENGTH_UNIT_CHAR) else if (unit == LENGTH_UNIT_CHAR)
@ -1837,13 +1837,13 @@ _add_chars_till_limit(Evas_Object *obj, char **text, int can_add, Length_Unit un
return; return;
} }
can_add = 0; can_add = 0;
strncpy(new_text, new_text + index, current_len - ((new_text + index) - *text)); strncpy(new_text, new_text + idx, current_len - ((new_text + idx) - *text));
current_len -= index; current_len -= idx;
(*text)[current_len] = 0; (*text)[current_len] = 0;
} }
else else
{ {
new_text += index; new_text += idx;
can_add -= unit_size; can_add -= unit_size;
} }
i++; i++;