Changeset 9b0a6b4 in mainline for uspace/srv


Ignore:
Timestamp:
2012-04-13T06:36:25Z (14 years ago)
Author:
Vojtech Horky <vojtechhorky@…>
Branches:
lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export
Children:
90f067d9
Parents:
e61aa80 (diff), d11a181 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.
Message:

Merge mainline changes

Location:
uspace/srv
Files:
5 edited

Legend:

Unmodified
Added
Removed

  • uspace/srv/fs/exfat/exfat_fat.c

    re61aa80 r9b0a6b4  
    127127{
    128128        exfat_cluster_t firstc = nodep->firstc;
    129         exfat_cluster_t currc;
     129        exfat_cluster_t currc = 0;
    130130        aoff64_t relbn = bn;
    131131        int rc;

  • uspace/srv/hid/fb/port/ega.c

    re61aa80 r9b0a6b4  
    117117        uint8_t glyph;
    118118       
    119         if ((field->ch >= 0) && (field->ch < 128))
     119        if (ascii_check(field->ch))
    120120                glyph = field->ch;
    121121        else

  • uspace/srv/hid/fb/port/kchar.c

    re61aa80 r9b0a6b4  
    4848static void kchar_putchar(wchar_t ch)
    4949{
    50         if ((ch >= 0) && (ch < 128))
     50        if (ascii_check(ch))
    5151                *kchar.addr = ch;
    5252        else

  • uspace/srv/hid/fb/port/kfb.c

    re61aa80 r9b0a6b4  
    409409        charfield_t *field = screenbuffer_field_at(vp->backbuf, col, row);
    410410       
    411         pixel_t bgcolor;
    412         pixel_t fgcolor;
     411        pixel_t bgcolor = 0;
     412        pixel_t fgcolor = 0;
    413413        attrs_rgb(field->attrs, &bgcolor, &fgcolor);
    414414       
    … …  
    525525        }
    526526       
    527         pixel_t bgcolor;
    528         pixel_t fgcolor;
     527        pixel_t bgcolor = 0;
     528        pixel_t fgcolor = 0;
    529529        attrs_rgb(vp->attrs, &bgcolor, &fgcolor);
    530530       

  • uspace/srv/hid/fb/port/niagara.c

    re61aa80 r9b0a6b4  
    6868static void niagara_putchar(wchar_t ch)
    6969{
    70         if ((ch >= 0) && (ch < 128))
     70        if (ascii_check(ch))
    7171                niagara_putc(ch);
    7272        else
Note: See TracChangeset for help on using the changeset viewer.