Changeset 62140db in mainline

Timestamp:

2009-06-16T21:53:42Z (15 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

Files:

• app/init/init.c (modified) (4 diffs)
• app/tester/stdio/stdio2.c (modified) (1 diff)
• lib/libblock/libblock.c (modified) (2 diffs)
• lib/libc/generic/devmap.c (modified) (1 diff)
• srv/fb/ppm.c (modified) (1 diff)

uspace/app/init/init.c

@@ -129 +129 @@
         char *argv[4];
         char vc[MAX_DEVICE_NAME];
+        int rc;
         
         snprintf(vc, MAX_DEVICE_NAME, "/dev/%s", dev);
@@ -135 +136 @@
         
         dev_handle_t handle;
-        devmap_device_get_handle(dev, &handle, IPC_FLAG_BLOCKING);
+        rc = devmap_device_get_handle(dev, &handle, IPC_FLAG_BLOCKING);
         
-        if (handle >= 0) {
+        if (rc == EOK) {
                 argv[0] = "/app/getvc";
                 argv[1] = vc;
@@ -145 +146 @@
                 if (!task_spawn("/app/getvc", argv))
                         printf(NAME ": Error spawning getvc on %s\n", vc);
-        } else
+        } else {
                 printf(NAME ": Error waiting on %s\n", vc);
+        }
 }
 
@@ -161 +163 @@
         
         if (!mount_devfs()) {
-                return(NAME ": Exiting\n");
+                printf(NAME ": Exiting\n");
                 return -2;
         }

uspace/app/tester/stdio/stdio2.c

@@ -36 +36 @@
         FILE *f;
         char *file_name = "/test";
-        size_t n;
         int c;
 

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;
         }

uspace/srv/fb/ppm.c

@@ -90 +90 @@
         unsigned int width, height;
         unsigned int maxcolor;
-        int i;
+        unsigned i;
         unsigned int color;
         unsigned int coef;