Ignore:
File:
1 edited

Legend:

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

    rb7fd2a0 r51774cd  
    5353uint8_t *plb = NULL;
    5454
    55 static errno_t plb_insert_entry(plb_entry_t *entry, char *path, size_t *start,
     55static int plb_insert_entry(plb_entry_t *entry, char *path, size_t *start,
    5656    size_t len)
    5757{
     
    138138}
    139139
    140 errno_t vfs_link_internal(vfs_node_t *base, char *path, vfs_triplet_t *child)
     140int vfs_link_internal(vfs_node_t *base, char *path, vfs_triplet_t *child)
    141141{
    142142        assert(base != NULL);
     
    148148        vfs_lookup_res_t res;
    149149        char component[NAME_MAX + 1];
    150         errno_t rc;
     150        int rc;
    151151       
    152152        size_t len;
     
    197197       
    198198        rc = async_data_write_start(exch, component, str_size(component) + 1);
    199         errno_t orig_rc;
     199        sysarg_t orig_rc;
    200200        async_wait_for(req, &orig_rc);
    201201        vfs_exchange_release(exch);
     
    207207}
    208208
    209 static errno_t out_lookup(vfs_triplet_t *base, size_t *pfirst, size_t *plen,
     209static int out_lookup(vfs_triplet_t *base, size_t *pfirst, size_t *plen,
    210210    int lflag, vfs_lookup_res_t *result)
    211211{
     
    213213        assert(result);
    214214       
    215         errno_t rc;
     215        sysarg_t rc;
    216216        ipc_call_t answer;
    217217        async_exch_t *exch = vfs_exchange_grab(base->fs_handle);
     
    222222        vfs_exchange_release(exch);
    223223       
    224         if (rc != EOK)
    225                 return rc;
     224        if ((int) rc < 0)
     225                return (int) rc;
    226226       
    227227        unsigned last = *pfirst + *plen;
     
    229229        *plen = last - *pfirst;
    230230       
    231         result->triplet.fs_handle = (fs_handle_t) IPC_GET_ARG1(answer);
    232         result->triplet.service_id = base->service_id;
     231        result->triplet.fs_handle = (fs_handle_t) rc;
     232        result->triplet.service_id = (service_id_t) IPC_GET_ARG1(answer);
    233233        result->triplet.index = (fs_index_t) IPC_GET_ARG2(answer);
    234234        result->size = MERGE_LOUP32(IPC_GET_ARG4(answer), IPC_GET_ARG5(answer));
     
    238238}
    239239
    240 static errno_t _vfs_lookup_internal(vfs_node_t *base, char *path, int lflag,
     240static int _vfs_lookup_internal(vfs_node_t *base, char *path, int lflag,
    241241    vfs_lookup_res_t *result, size_t len)
    242242{
    243243        size_t first;
    244         errno_t rc;
     244        int rc;
    245245
    246246        plb_entry_t entry;
     
    334334 *
    335335 */
    336 errno_t vfs_lookup_internal(vfs_node_t *base, char *path, int lflag,
     336int vfs_lookup_internal(vfs_node_t *base, char *path, int lflag,
    337337    vfs_lookup_res_t *result)
    338338{
     
    341341       
    342342        size_t len;
    343         errno_t rc;
     343        int rc;
    344344        char *npath = canonify(path, &len);
    345345        if (!npath) {
Note: See TracChangeset for help on using the changeset viewer.