From: Enlightenment S. <no-...@en...> - 2011-07-30 03:19:50
|
Log: warning about shadowing symbols! BEGONE! Author: sachiel Date: 2011-07-29 20:19:44 -0700 (Fri, 29 Jul 2011) New Revision: 61919 Trac: http://trac.enlightenment.org/e/changeset/61919 Modified: trunk/elementary/src/lib/elm_entry.c Modified: trunk/elementary/src/lib/elm_entry.c =================================================================== --- trunk/elementary/src/lib/elm_entry.c 2011-07-30 03:16:46 UTC (rev 61918) +++ trunk/elementary/src/lib/elm_entry.c 2011-07-30 03:19:44 UTC (rev 61919) @@ -1804,20 +1804,20 @@ } else { - int index = 0; + int idx = 0; if (*new_text == '&') { - while (*(new_text + index) != ';') + while (*(new_text + idx) != ';') { - index++; - if (!*(new_text + index)) break; + idx++; + if (!*(new_text + idx)) break; } } char *markup; - index = evas_string_char_next_get(new_text, index, NULL); - markup = malloc(index + 1); - strncpy(markup, new_text, index); - markup[index] = 0; + idx = evas_string_char_next_get(new_text, idx, NULL); + markup = malloc(idx + 1); + strncpy(markup, new_text, idx); + markup[idx] = 0; if (unit == LENGTH_UNIT_BYTE) unit_size = strlen(elm_entry_markup_to_utf8(markup)); else if (unit == LENGTH_UNIT_CHAR) @@ -1837,13 +1837,13 @@ return; } can_add = 0; - strncpy(new_text, new_text + index, current_len - ((new_text + index) - *text)); - current_len -= index; + strncpy(new_text, new_text + idx, current_len - ((new_text + idx) - *text)); + current_len -= idx; (*text)[current_len] = 0; } else { - new_text += index; + new_text += idx; can_add -= unit_size; } i++; |