Changeset c6588ce in mainline for uspace/srv/hid/fb/port/kfb.c

Timestamp:

2012-05-05T08:12:17Z (12 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export

Children:

ee04c28

Parents:

2cc7f16 (diff), d21e935c (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.

File:

• uspace/srv/hid/fb/port/kfb.c (modified) (2 diffs)

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

@@ -409 +409 @@
         charfield_t *field = screenbuffer_field_at(vp->backbuf, col, row);
         
-        pixel_t bgcolor;
-        pixel_t fgcolor;
+        pixel_t bgcolor = 0;
+        pixel_t fgcolor = 0;
         attrs_rgb(field->attrs, &bgcolor, &fgcolor);
         
@@ -525 +525 @@
         }
         
-        pixel_t bgcolor;
-        pixel_t fgcolor;
+        pixel_t bgcolor = 0;
+        pixel_t fgcolor = 0;
         attrs_rgb(vp->attrs, &bgcolor, &fgcolor);