Changeset 132ab5d1 in mainline for uspace/srv/vfs/vfs.c


Ignore:
Timestamp:
2018-01-30T03:20:45Z (8 years ago)
Author:
Jenda <jenda.jzqk73@…>
Branches:
lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export
Children:
5a6cc679
Parents:
8bfb163 (diff), 6a5d05b (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 commit '6a5d05bd2551e64111bea4f9332dd7448c26ce84' into forwardport

Separate return value from error code in gen_irq_code*().

File:
1 edited

Legend:

Unmodified
Added
Removed
  • uspace/srv/vfs/vfs.c

    r8bfb163 r132ab5d1  
    4444#include <async.h>
    4545#include <errno.h>
     46#include <str_error.h>
    4647#include <stdio.h>
    4748#include <stdbool.h>
     
    7677}
    7778
    78 static void notification_handler(ipc_callid_t callid, ipc_call_t *call, void *arg)
     79static void notification_handler(ipc_call_t *call, void *arg)
    7980{
    8081        if (IPC_GET_ARG1(*call) == VFS_PASS_HANDLE)
     
    122123        port_id_t port;
    123124        rc = async_create_port(INTERFACE_PAGER, vfs_pager, NULL, &port);
    124         if (rc != EOK)
     125        if (rc != EOK) {
     126                printf("%s: Cannot create pager port: %s\n", NAME, str_error(rc));
    125127                return rc;
    126                
     128        }
     129
    127130        /*
    128131         * Set a connection handling function/fibril.
     
    141144        rc = service_register(SERVICE_VFS);
    142145        if (rc != EOK) {
    143                 printf("%s: Cannot register VFS service\n", NAME);
     146                printf("%s: Cannot register VFS service: %s\n", NAME, str_error(rc));
    144147                return rc;
    145148        }
Note: See TracChangeset for help on using the changeset viewer.