Changeset 08f747e in mainline for uspace/srv/hid/console/console.c

Timestamp:

2010-11-26T21:49:30Z (13 years ago)

Author:

Vojtech Horky <vojtechhorky@…>

Branches:

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

Children:

8e423a2d, dac43be

Parents:

e4dbfda (diff), da55d5b (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 development/ changes

File:

• uspace/srv/hid/console/console.c (modified) (2 diffs)

uspace/srv/hid/console/console.c

@@ -804 +804 @@
                         if (screenbuffer_init(&consoles[i].scr,
                             fb_info.cols, fb_info.rows) == NULL) {
-                                printf(NAME ": Unable to allocate screen buffer %u\n", i);
+                                printf(NAME ": Unable to allocate screen buffer %zu\n", i);
                                 return false;
                         }
@@ -813 +813 @@
                         
                         char vc[DEVMAP_NAME_MAXLEN + 1];
-                        snprintf(vc, DEVMAP_NAME_MAXLEN, "%s/vc%u", NAMESPACE, i);
+                        snprintf(vc, DEVMAP_NAME_MAXLEN, "%s/vc%zu", NAMESPACE, i);
                         
                         if (devmap_device_register(vc, &consoles[i].devmap_handle) != EOK) {