Changeset 28be7fa in mainline

Timestamp:

2010-02-03T13:55:36Z (15 years ago)

Author:

Martin Decky <martin@…>

Branches:

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

Children:

472c09d

Parents:

210e50a

Message:

cstyle changes, no change in functionality

Location:

uspace

Files:

• app/init/init.c (modified) (2 diffs)
• app/init/init.h (modified) (1 diff)
• lib/libc/generic/vfs/vfs.c (modified) (3 diffs)

uspace/app/init/init.c

@@ -171 +171 @@
 {
         char *argv[3];
-        char hid_in[MAX_DEVICE_NAME];
+        char hid_in[DEVMAP_NAME_MAXLEN];
         int rc;
         
-        snprintf(hid_in, MAX_DEVICE_NAME, "%s/%s", DEVFS_MOUNT_POINT, dev);
+        snprintf(hid_in, DEVMAP_NAME_MAXLEN, "%s/%s", DEVFS_MOUNT_POINT, dev);
         
         printf(NAME ": Spawning %s with %s\n", SRV_CONSOLE, hid_in);
@@ -196 +196 @@
 {
         char *argv[4];
-        char term[MAX_DEVICE_NAME];
+        char term[DEVMAP_NAME_MAXLEN];
         int rc;
         
-        snprintf(term, MAX_DEVICE_NAME, "%s/%s", DEVFS_MOUNT_POINT, dev);
+        snprintf(term, DEVMAP_NAME_MAXLEN, "%s/%s", DEVFS_MOUNT_POINT, dev);
         
         printf(NAME ": Spawning %s with %s %s\n", APP_GETTERM, term, app);

uspace/app/init/init.h

@@ -39 +39 @@
 #define NAME  "init"
 
-#define MAX_DEVICE_NAME  32
-
 #endif
 

uspace/lib/libc/generic/vfs/vfs.c

@@ -120 +120 @@
     const char *opts, unsigned int flags)
 {
-        int res;
-        ipcarg_t rc;
-        ipcarg_t rc_orig;
-        aid_t req;
-        dev_handle_t dev_handle;
         int null_id = -1;
         char null[DEVMAP_NAME_MAXLEN];
@@ -140 +135 @@
         }
         
-        res = devmap_device_get_handle(fqdn, &dev_handle, flags);
+        dev_handle_t dev_handle;
+        int res = devmap_device_get_handle(fqdn, &dev_handle, flags);
         if (res != EOK) {
                 if (null_id != -1)
@@ -161 +157 @@
         vfs_connect();
         
-        req = async_send_2(vfs_phone, VFS_IN_MOUNT, dev_handle, flags, NULL);
-        rc = async_data_write_start(vfs_phone, (void *) mpa, mpa_size);
+        ipcarg_t rc_orig;
+        aid_t req = async_send_2(vfs_phone, VFS_IN_MOUNT, dev_handle, flags, NULL);
+        ipcarg_t rc = async_data_write_start(vfs_phone, (void *) mpa, mpa_size);
         if (rc != EOK) {
                 async_wait_for(req, &rc_orig);