Changeset 62140db in mainline for uspace/lib

Timestamp:

2009-06-16T21:53:42Z (16 years ago)

Author:

Jiri Svoboda <jirik.svoboda@…>

Branches:

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

Children:

61d2315

Parents:

0471786

Message:

Fix assorted warnings and tiny glitches.

Location:

uspace/lib

Files:

• libblock/libblock.c (modified) (2 diffs)
• libc/generic/devmap.c (modified) (1 diff)

uspace/lib/libblock/libblock.c

@@ -475 +475 @@
                 }
                 
-                if (*bufpos == *buflen) {
+                if (*bufpos == (off_t) *buflen) {
                         /* Refill the communication buffer with a new block. */
                         ipcarg_t retval;
@@ -481 +481 @@
                             *pos / block_size, block_size, &retval);
                         if ((rc != EOK) || (retval != EOK))
-                                return (rc != EOK ? rc : retval);
+                                return (rc != EOK ? rc : (int) retval);
                         
                         *bufpos = 0;

uspace/lib/libc/generic/devmap.c

@@ -194 +194 @@
         if (retval != EOK) {
                 if (handle != NULL)
-                        *handle = -1;
+                        *handle = (dev_handle_t) -1;
                 return retval;
         }