Changeset 28be7fa in mainline


Ignore:
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:
3 edited

Legend:

Unmodified
Added
Removed
  • uspace/app/init/init.c

    r210e50a r28be7fa  
    171171{
    172172        char *argv[3];
    173         char hid_in[MAX_DEVICE_NAME];
     173        char hid_in[DEVMAP_NAME_MAXLEN];
    174174        int rc;
    175175       
    176         snprintf(hid_in, MAX_DEVICE_NAME, "%s/%s", DEVFS_MOUNT_POINT, dev);
     176        snprintf(hid_in, DEVMAP_NAME_MAXLEN, "%s/%s", DEVFS_MOUNT_POINT, dev);
    177177       
    178178        printf(NAME ": Spawning %s with %s\n", SRV_CONSOLE, hid_in);
     
    196196{
    197197        char *argv[4];
    198         char term[MAX_DEVICE_NAME];
     198        char term[DEVMAP_NAME_MAXLEN];
    199199        int rc;
    200200       
    201         snprintf(term, MAX_DEVICE_NAME, "%s/%s", DEVFS_MOUNT_POINT, dev);
     201        snprintf(term, DEVMAP_NAME_MAXLEN, "%s/%s", DEVFS_MOUNT_POINT, dev);
    202202       
    203203        printf(NAME ": Spawning %s with %s %s\n", APP_GETTERM, term, app);
  • uspace/app/init/init.h

    r210e50a r28be7fa  
    3939#define NAME  "init"
    4040
    41 #define MAX_DEVICE_NAME  32
    42 
    4341#endif
    4442
  • uspace/lib/libc/generic/vfs/vfs.c

    r210e50a r28be7fa  
    120120    const char *opts, unsigned int flags)
    121121{
    122         int res;
    123         ipcarg_t rc;
    124         ipcarg_t rc_orig;
    125         aid_t req;
    126         dev_handle_t dev_handle;
    127122        int null_id = -1;
    128123        char null[DEVMAP_NAME_MAXLEN];
     
    140135        }
    141136       
    142         res = devmap_device_get_handle(fqdn, &dev_handle, flags);
     137        dev_handle_t dev_handle;
     138        int res = devmap_device_get_handle(fqdn, &dev_handle, flags);
    143139        if (res != EOK) {
    144140                if (null_id != -1)
     
    161157        vfs_connect();
    162158       
    163         req = async_send_2(vfs_phone, VFS_IN_MOUNT, dev_handle, flags, NULL);
    164         rc = async_data_write_start(vfs_phone, (void *) mpa, mpa_size);
     159        ipcarg_t rc_orig;
     160        aid_t req = async_send_2(vfs_phone, VFS_IN_MOUNT, dev_handle, flags, NULL);
     161        ipcarg_t rc = async_data_write_start(vfs_phone, (void *) mpa, mpa_size);
    165162        if (rc != EOK) {
    166163                async_wait_for(req, &rc_orig);
Note: See TracChangeset for help on using the changeset viewer.