Ignore:
Timestamp:
Nov 27, 2006, 3:53:17 PM (14 years ago)
Author:
Sam Hocevar
Message:
  • Fix shadowing declarations.
File:
1 edited

Legend:

Unmodified
Added
Removed
  • libcaca/trunk/cucul/canvas.c

    r1390 r1438  
    220220int cucul_put_str(cucul_canvas_t *cv, int x, int y, char const *s)
    221221{
    222     unsigned int read;
     222    unsigned int rd;
    223223
    224224    if(y < 0 || y >= (int)cv->height || x >= (int)cv->width)
     
    227227    while(*s && x < -1)
    228228    {
    229         x += cucul_utf32_is_fullwidth(cucul_utf8_to_utf32(s, &read)) ? 2 : 1;
    230         s += read;
     229        x += cucul_utf32_is_fullwidth(cucul_utf8_to_utf32(s, &rd)) ? 2 : 1;
     230        s += rd;
    231231    }
    232232
    233233    while(*s && x < (int)cv->width)
    234234    {
    235         uint32_t ch = cucul_utf8_to_utf32(s, &read);
     235        uint32_t ch = cucul_utf8_to_utf32(s, &rd);
    236236        cucul_put_char(cv, x, y, ch);
    237237        x += cucul_utf32_is_fullwidth(ch) ? 2 : 1;
    238         s += read;
     238        s += rd;
    239239    }
    240240
Note: See TracChangeset for help on using the changeset viewer.