Changeset b7fd2a0 in mainline for uspace/lib/fs


Ignore:
Timestamp:
2018-01-13T03:10:29Z (8 years ago)
Author:
Jiří Zárevúcky <zarevucky.jiri@…>
Branches:
lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export
Children:
a53ed3a
Parents:
36f0738
Message:

Use errno_t in all uspace and kernel code.

Change type of every variable, parameter and return value that holds an
<errno.h> constant to either errno_t (the usual case), or sys_errno_t
(some places in kernel). This is for the purpose of self-documentation,
as well as for type-checking with a bit of type definition hackery.

Although this is a massive commit, it is a simple text replacement, and thus
is very easy to verify. Simply do the following:

`
git checkout <this commit's hash>
git reset HEAD
git add .
tools/srepl '\berrno_t\b' int
git add .
tools/srepl '\bsys_errno_t\b' sysarg_t
git reset
git diff
`

While this doesn't ensure that the replacements are correct, it does ensure
that the commit doesn't do anything except those replacements. Since errno_t
is typedef'd to int in the usual case (and sys_errno_t to sysarg_t), even if
incorrect, this commit cannot change behavior.

Location:
uspace/lib/fs
Files:
2 edited

Legend:

Unmodified
Added
Removed

  • uspace/lib/fs/libfs.c

    r36f0738 rb7fd2a0  
    8484{
    8585        service_id_t service_id = (service_id_t) IPC_GET_ARG1(*req);
    86         int rc;
     86        errno_t rc;
    8787        vfs_fs_probe_info_t info;
    8888       
    … …  
    112112        service_id_t service_id = (service_id_t) IPC_GET_ARG1(*req);
    113113        char *opts;
    114         int rc;
     114        errno_t rc;
    115115       
    116116        /* Accept the mount options. */
    … …  
    136136{
    137137        service_id_t service_id = (service_id_t) IPC_GET_ARG1(*req);
    138         int rc;
     138        errno_t rc;
    139139
    140140        rc = vfs_out_ops->unmounted(service_id);
    … …  
    160160            IPC_GET_ARG4(*req));
    161161        size_t rbytes;
    162         int rc;
     162        errno_t rc;
    163163
    164164        rc = vfs_out_ops->read(service_id, index, pos, &rbytes);
    … …  
    178178        size_t wbytes;
    179179        aoff64_t nsize;
    180         int rc;
     180        errno_t rc;
    181181
    182182        rc = vfs_out_ops->write(service_id, index, pos, &wbytes, &nsize);
    … …  
    195195        aoff64_t size = (aoff64_t) MERGE_LOUP32(IPC_GET_ARG3(*req),
    196196            IPC_GET_ARG4(*req));
    197         int rc;
     197        errno_t rc;
    198198
    199199        rc = vfs_out_ops->truncate(service_id, index, size);
    … …  
    206206        service_id_t service_id = (service_id_t) IPC_GET_ARG1(*req);
    207207        fs_index_t index = (fs_index_t) IPC_GET_ARG2(*req);
    208         int rc;
     208        errno_t rc;
    209209
    210210        rc = vfs_out_ops->close(service_id, index);
    … …  
    218218        fs_index_t index = (fs_index_t) IPC_GET_ARG2(*req);
    219219
    220         int rc;
     220        errno_t rc;
    221221        fs_node_t *node = NULL;
    222222        rc = libfs_ops->node_get(&node, service_id, index);
    … …  
    244244        service_id_t service_id = (service_id_t) IPC_GET_ARG1(*req);
    245245        fs_index_t index = (fs_index_t) IPC_GET_ARG2(*req);
    246         int rc;
     246        errno_t rc;
    247247
    248248        rc = vfs_out_ops->sync(service_id, index);
    … …  
    260260        service_id_t service_id = (service_id_t) IPC_GET_ARG1(*req);
    261261        fs_index_t index = (fs_index_t) IPC_GET_ARG2(*req);
    262         int rc;
     262        errno_t rc;
    263263
    264264        fs_node_t *node = NULL;
    … …  
    364364 *
    365365 */
    366 int fs_register(async_sess_t *sess, vfs_info_t *info, vfs_out_ops_t *vops,
     366errno_t fs_register(async_sess_t *sess, vfs_info_t *info, vfs_out_ops_t *vops,
    367367    libfs_ops_t *lops)
    368368{
    … …  
    381381         * Send our VFS info structure to VFS.
    382382         */
    383         int rc = async_data_write_start(exch, info, sizeof(*info));
     383        errno_t rc = async_data_write_start(exch, info, sizeof(*info));
    384384       
    385385        if (rc != EOK) {
    … …  
    446446}
    447447
    448 static int plb_get_component(char *dest, unsigned *sz, unsigned *ppos,
     448static errno_t plb_get_component(char *dest, unsigned *sz, unsigned *ppos,
    449449    unsigned last)
    450450{
    … …  
    476476}
    477477
    478 static int receive_fname(char *buffer)
     478static errno_t receive_fname(char *buffer)
    479479{
    480480        size_t size;
    … …  
    500500       
    501501        char component[NAME_MAX + 1];
    502         int rc = receive_fname(component);
     502        errno_t rc = receive_fname(component);
    503503        if (rc != EOK) {
    504504                async_answer_0(rid, rc);
    … …  
    555555       
    556556        char component[NAME_MAX + 1];
    557         int rc;
     557        errno_t rc;
    558558       
    559559        fs_node_t *par = NULL;
    … …  
    727727
    728728        fs_node_t *fn;
    729         int rc = ops->node_get(&fn, service_id, index);
     729        errno_t rc = ops->node_get(&fn, service_id, index);
    730730        on_error(rc, answer_and_return(rid, rc));
    731731
    … …  
    766766
    767767        fs_node_t *fn;
    768         int rc = ops->node_get(&fn, service_id, index);
     768        errno_t rc = ops->node_get(&fn, service_id, index);
    769769        on_error(rc, answer_and_return(rid, rc));
    770770
    … …  
    826826       
    827827        fs_node_t *fn;
    828         int rc = ops->node_get(&fn, service_id, index);
     828        errno_t rc = ops->node_get(&fn, service_id, index);
    829829        on_error(rc, answer_and_return(rid, rc));
    830830       
    … …  
    853853} fs_instance_t;
    854854
    855 int fs_instance_create(service_id_t service_id, void *data)
     855errno_t fs_instance_create(service_id_t service_id, void *data)
    856856{
    857857        fs_instance_t *inst = malloc(sizeof(fs_instance_t));
    … …  
    884884}
    885885
    886 int fs_instance_get(service_id_t service_id, void **idp)
     886errno_t fs_instance_get(service_id_t service_id, void **idp)
    887887{
    888888        fibril_mutex_lock(&instances_mutex);
    … …  
    898898}
    899899
    900 int fs_instance_destroy(service_id_t service_id)
     900errno_t fs_instance_destroy(service_id_t service_id)
    901901{
    902902        fibril_mutex_lock(&instances_mutex);

  • uspace/lib/fs/libfs.h

    r36f0738 rb7fd2a0  
    4343
    4444typedef struct {
    45         int (* fsprobe)(service_id_t, vfs_fs_probe_info_t *);
    46         int (* mounted)(service_id_t, const char *, fs_index_t *, aoff64_t *);
    47         int (* unmounted)(service_id_t);
    48         int (* read)(service_id_t, fs_index_t, aoff64_t, size_t *);
    49         int (* write)(service_id_t, fs_index_t, aoff64_t, size_t *,
     45        errno_t (* fsprobe)(service_id_t, vfs_fs_probe_info_t *);
     46        errno_t (* mounted)(service_id_t, const char *, fs_index_t *, aoff64_t *);
     47        errno_t (* unmounted)(service_id_t);
     48        errno_t (* read)(service_id_t, fs_index_t, aoff64_t, size_t *);
     49        errno_t (* write)(service_id_t, fs_index_t, aoff64_t, size_t *,
    5050            aoff64_t *);
    51         int (* truncate)(service_id_t, fs_index_t, aoff64_t);
    52         int (* close)(service_id_t, fs_index_t);
    53         int (* destroy)(service_id_t, fs_index_t);
    54         int (* sync)(service_id_t, fs_index_t);
     51        errno_t (* truncate)(service_id_t, fs_index_t, aoff64_t);
     52        errno_t (* close)(service_id_t, fs_index_t);
     53        errno_t (* destroy)(service_id_t, fs_index_t);
     54        errno_t (* sync)(service_id_t, fs_index_t);
    5555} vfs_out_ops_t;
    5656
    … …  
    6565         * argument holds the output argument.
    6666         */
    67         int (* root_get)(fs_node_t **, service_id_t);
    68         int (* match)(fs_node_t **, fs_node_t *, const char *);
    69         int (* node_get)(fs_node_t **, service_id_t, fs_index_t);
    70         int (* node_open)(fs_node_t *);
    71         int (* node_put)(fs_node_t *);
    72         int (* create)(fs_node_t **, service_id_t, int);
    73         int (* destroy)(fs_node_t *);
    74         int (* link)(fs_node_t *, fs_node_t *, const char *);
    75         int (* unlink)(fs_node_t *, fs_node_t *, const char *);
    76         int (* has_children)(bool *, fs_node_t *);
     67        errno_t (* root_get)(fs_node_t **, service_id_t);
     68        errno_t (* match)(fs_node_t **, fs_node_t *, const char *);
     69        errno_t (* node_get)(fs_node_t **, service_id_t, fs_index_t);
     70        errno_t (* node_open)(fs_node_t *);
     71        errno_t (* node_put)(fs_node_t *);
     72        errno_t (* create)(fs_node_t **, service_id_t, int);
     73        errno_t (* destroy)(fs_node_t *);
     74        errno_t (* link)(fs_node_t *, fs_node_t *, const char *);
     75        errno_t (* unlink)(fs_node_t *, fs_node_t *, const char *);
     76        errno_t (* has_children)(bool *, fs_node_t *);
    7777        /*
    7878         * The second set of methods are usually mere getters that do not
    … …  
    8585        bool (* is_file)(fs_node_t *);
    8686        service_id_t (* service_get)(fs_node_t *);
    87         int (* size_block)(service_id_t, uint32_t *);
    88         int (* total_block_count)(service_id_t, uint64_t *);
    89         int (* free_block_count)(service_id_t, uint64_t *);
     87        errno_t (* size_block)(service_id_t, uint32_t *);
     88        errno_t (* total_block_count)(service_id_t, uint64_t *);
     89        errno_t (* free_block_count)(service_id_t, uint64_t *);
    9090} libfs_ops_t;
    9191
    … …  
    9595} fs_reg_t;
    9696
    97 extern int fs_register(async_sess_t *, vfs_info_t *, vfs_out_ops_t *,
     97extern errno_t fs_register(async_sess_t *, vfs_info_t *, vfs_out_ops_t *,
    9898    libfs_ops_t *);
    9999
    100100extern void fs_node_initialize(fs_node_t *);
    101101
    102 extern int fs_instance_create(service_id_t, void *);
    103 extern int fs_instance_get(service_id_t, void **);
    104 extern int fs_instance_destroy(service_id_t);
     102extern errno_t fs_instance_create(service_id_t, void *);
     103extern errno_t fs_instance_get(service_id_t, void **);
     104extern errno_t fs_instance_destroy(service_id_t);
    105105
    106106#endif
Note: See TracChangeset for help on using the changeset viewer.