Changeset 61c0402 in mainline for kernel/generic/src/console/console.c

Timestamp:

2010-01-15T19:36:53Z (14 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

92bee46

Parents:

50f9c3a (diff), 963462af (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:

• kernel/generic/src/console/console.c (modified) (1 diff)

kernel/generic/src/console/console.c

@@ -319 +319 @@
         
         if (size > PAGE_SIZE)
-                return ELIMIT;
+                return (unative_t) ELIMIT;
         
         if (size > 0) {
                 data = (char *) malloc(size + 1, 0);
                 if (!data)
-                        return ENOMEM;
+                        return (unative_t) ENOMEM;
                 
                 rc = copy_from_uspace(data, buf, size);
                 if (rc) {
                         free(data);
-                        return rc;
+                        return (unative_t) rc;
                 }
                 data[size] = 0;