Changeset b7fd2a0 in mainline for uspace/srv/volsrv


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/srv/volsrv
Files:
7 edited

Legend:

Unmodified
Added
Removed

  • uspace/srv/volsrv/empty.c

    r36f0738 rb7fd2a0  
    4444#include "empty.h"
    4545
    46 static int empty_get_bsize(void *, size_t *);
    47 static int empty_get_nblocks(void *, aoff64_t *);
    48 static int empty_read(void *, aoff64_t, size_t, void *);
    49 static int empty_write(void *, aoff64_t, size_t, const void *);
     46static errno_t empty_get_bsize(void *, size_t *);
     47static errno_t empty_get_nblocks(void *, aoff64_t *);
     48static errno_t empty_read(void *, aoff64_t, size_t, void *);
     49static errno_t empty_write(void *, aoff64_t, size_t, const void *);
    5050
    5151/** Provide disk access to liblabel */
    … …  
    5757};
    5858
    59 int volsrv_part_is_empty(service_id_t sid, bool *rempty)
     59errno_t volsrv_part_is_empty(service_id_t sid, bool *rempty)
    6060{
    61         int rc;
     61        errno_t rc;
    6262        label_bd_t lbd;
    6363
    … …  
    7878}
    7979
    80 int volsrv_part_empty(service_id_t sid)
     80errno_t volsrv_part_empty(service_id_t sid)
    8181{
    82         int rc;
     82        errno_t rc;
    8383        label_bd_t lbd;
    8484
    … …  
    100100
    101101/** Get block size wrapper for liblabel */
    102 static int empty_get_bsize(void *arg, size_t *bsize)
     102static errno_t empty_get_bsize(void *arg, size_t *bsize)
    103103{
    104104        service_id_t svc_id = *(service_id_t *)arg;
    … …  
    107107
    108108/** Get number of blocks wrapper for liblabel */
    109 static int empty_get_nblocks(void *arg, aoff64_t *nblocks)
     109static errno_t empty_get_nblocks(void *arg, aoff64_t *nblocks)
    110110{
    111111        service_id_t svc_id = *(service_id_t *)arg;
    … …  
    114114
    115115/** Read blocks wrapper for liblabel */
    116 static int empty_read(void *arg, aoff64_t ba, size_t cnt, void *buf)
     116static errno_t empty_read(void *arg, aoff64_t ba, size_t cnt, void *buf)
    117117{
    118118        service_id_t svc_id = *(service_id_t *)arg;
    … …  
    121121
    122122/** Write blocks wrapper for liblabel */
    123 static int empty_write(void *arg, aoff64_t ba, size_t cnt, const void *data)
     123static errno_t empty_write(void *arg, aoff64_t ba, size_t cnt, const void *data)
    124124{
    125125        service_id_t svc_id = *(service_id_t *)arg;

  • uspace/srv/volsrv/empty.h

    r36f0738 rb7fd2a0  
    4040#include <loc.h>
    4141
    42 extern int volsrv_part_is_empty(service_id_t, bool *);
    43 extern int volsrv_part_empty(service_id_t);
     42extern errno_t volsrv_part_is_empty(service_id_t, bool *);
     43extern errno_t volsrv_part_empty(service_id_t);
    4444
    4545#endif

  • uspace/srv/volsrv/mkfs.c

    r36f0738 rb7fd2a0  
    4747#include "mkfs.h"
    4848
    49 static int cmd_runl(const char *path, ...)
     49static errno_t cmd_runl(const char *path, ...)
    5050{
    5151        va_list ap;
    … …  
    6363        task_id_t id;
    6464        task_wait_t wait;
    65         int rc = task_spawn(&id, &wait, path, cnt, ap);
     65        errno_t rc = task_spawn(&id, &wait, path, cnt, ap);
    6666        va_end(ap);
    6767
    … …  
    102102
    103103
    104 int volsrv_part_mkfs(service_id_t sid, vol_fstype_t fstype, const char *label)
     104errno_t volsrv_part_mkfs(service_id_t sid, vol_fstype_t fstype, const char *label)
    105105{
    106106        const char *cmd;
    107107        char *svc_name;
    108         int rc;
     108        errno_t rc;
    109109
    110110        cmd = NULL;

  • uspace/srv/volsrv/mkfs.h

    r36f0738 rb7fd2a0  
    4141#include <types/vol.h>
    4242
    43 extern int volsrv_part_mkfs(service_id_t, vol_fstype_t, const char *);
     43extern errno_t volsrv_part_mkfs(service_id_t, vol_fstype_t, const char *);
    4444extern void volsrv_part_get_lsupp(vol_fstype_t, vol_label_supp_t *);
    4545

  • uspace/srv/volsrv/part.c

    r36f0738 rb7fd2a0  
    5050#include "types/part.h"
    5151
    52 static int vol_part_add_locked(service_id_t);
     52static errno_t vol_part_add_locked(service_id_t);
    5353static LIST_INITIALIZE(vol_parts); /* of vol_part_t */
    5454static FIBRIL_MUTEX_INITIALIZE(vol_parts_lock);
    … …  
    6969
    7070/** Check for new partitions */
    71 static int vol_part_check_new(void)
     71static errno_t vol_part_check_new(void)
    7272{
    7373        bool already_known;
    … …  
    7575        service_id_t *svcs;
    7676        size_t count, i;
    77         int rc;
     77        errno_t rc;
    7878
    7979        fibril_mutex_lock(&vol_parts_lock);
    … …  
    144144}
    145145
    146 static int vol_part_probe(vol_part_t *part)
     146static errno_t vol_part_probe(vol_part_t *part)
    147147{
    148148        bool empty;
    … …  
    150150        struct fsname_type *fst;
    151151        char *label;
    152         int rc;
     152        errno_t rc;
    153153
    154154        log_msg(LOG_DEFAULT, LVL_NOTE, "Probe partition %s", part->svc_name);
    … …  
    204204}
    205205
    206 static int vol_part_add_locked(service_id_t sid)
     206static errno_t vol_part_add_locked(service_id_t sid)
    207207{
    208208        vol_part_t *part;
    209         int rc;
     209        errno_t rc;
    210210
    211211        assert(fibril_mutex_is_locked(&vol_parts_lock));
    … …  
    244244}
    245245
    246 int vol_part_add(service_id_t sid)
    247 {
    248         int rc;
     246errno_t vol_part_add(service_id_t sid)
     247{
     248        errno_t rc;
    249249
    250250        fibril_mutex_lock(&vol_parts_lock);
    … …  
    260260}
    261261
    262 int vol_part_init(void)
    263 {
    264         return EOK;
    265 }
    266 
    267 int vol_part_discovery_start(void)
    268 {
    269         int rc;
     262errno_t vol_part_init(void)
     263{
     264        return EOK;
     265}
     266
     267errno_t vol_part_discovery_start(void)
     268{
     269        errno_t rc;
    270270
    271271        rc = loc_register_cat_change_cb(vol_part_cat_change_cb);
    … …  
    280280
    281281/** Get list of partitions as array of service IDs. */
    282 int vol_part_get_ids(service_id_t *id_buf, size_t buf_size, size_t *act_size)
     282errno_t vol_part_get_ids(service_id_t *id_buf, size_t buf_size, size_t *act_size)
    283283{
    284284        size_t act_cnt;
    … …  
    308308}
    309309
    310 int vol_part_find_by_id(service_id_t sid, vol_part_t **rpart)
     310errno_t vol_part_find_by_id(service_id_t sid, vol_part_t **rpart)
    311311{
    312312        list_foreach(vol_parts, lparts, vol_part_t, part) {
    … …  
    321321}
    322322
    323 int vol_part_empty_part(vol_part_t *part)
    324 {
    325         int rc;
     323errno_t vol_part_empty_part(vol_part_t *part)
     324{
     325        errno_t rc;
    326326
    327327        log_msg(LOG_DEFAULT, LVL_DEBUG, "vol_part_empty_part()");
    … …  
    338338}
    339339
    340 int vol_part_mkfs_part(vol_part_t *part, vol_fstype_t fstype,
     340errno_t vol_part_mkfs_part(vol_part_t *part, vol_fstype_t fstype,
    341341    const char *label)
    342342{
    343         int rc;
     343        errno_t rc;
    344344
    345345        log_msg(LOG_DEFAULT, LVL_DEBUG, "vol_part_mkfs_part()");
    … …  
    370370}
    371371
    372 int vol_part_get_info(vol_part_t *part, vol_part_info_t *pinfo)
     372errno_t vol_part_get_info(vol_part_t *part, vol_part_info_t *pinfo)
    373373{
    374374        pinfo->pcnt = part->pcnt;

  • uspace/srv/volsrv/part.h

    r36f0738 rb7fd2a0  
    4343#include "types/part.h"
    4444
    45 extern int vol_part_init(void);
    46 extern int vol_part_discovery_start(void);
    47 extern int vol_part_add(service_id_t);
    48 extern int vol_part_get_ids(service_id_t *, size_t, size_t *);
    49 extern int vol_part_find_by_id(service_id_t, vol_part_t **);
    50 extern int vol_part_empty_part(vol_part_t *);
    51 extern int vol_part_mkfs_part(vol_part_t *, vol_fstype_t, const char *);
    52 extern int vol_part_get_info(vol_part_t *, vol_part_info_t *);
     45extern errno_t vol_part_init(void);
     46extern errno_t vol_part_discovery_start(void);
     47extern errno_t vol_part_add(service_id_t);
     48extern errno_t vol_part_get_ids(service_id_t *, size_t, size_t *);
     49extern errno_t vol_part_find_by_id(service_id_t, vol_part_t **);
     50extern errno_t vol_part_empty_part(vol_part_t *);
     51extern errno_t vol_part_mkfs_part(vol_part_t *, vol_fstype_t, const char *);
     52extern errno_t vol_part_get_info(vol_part_t *, vol_part_info_t *);
    5353
    5454#endif

  • uspace/srv/volsrv/volsrv.c

    r36f0738 rb7fd2a0  
    5454static void vol_client_conn(ipc_callid_t, ipc_call_t *, void *);
    5555
    56 static int vol_init(void)
    57 {
    58         int rc;
     56static errno_t vol_init(void)
     57{
     58        errno_t rc;
    5959        log_msg(LOG_DEFAULT, LVL_DEBUG, "vol_init()");
    6060
    … …  
    9090        size_t size;
    9191        size_t act_size;
    92         int rc;
     92        errno_t rc;
    9393
    9494        if (!async_data_read_receive(&callid, &size)) {
    … …  
    112112        }
    113113
    114         int retval = async_data_read_finalize(callid, id_buf, size);
     114        errno_t retval = async_data_read_finalize(callid, id_buf, size);
    115115        free(id_buf);
    116116
    … …  
    121121{
    122122        service_id_t sid;
    123         int rc;
     123        errno_t rc;
    124124
    125125        sid = IPC_GET_ARG1(*icall);
    … …  
    139139        vol_part_t *part;
    140140        vol_part_info_t pinfo;
    141         int rc;
     141        errno_t rc;
    142142
    143143        sid = IPC_GET_ARG1(*icall);
    … …  
    185185        service_id_t sid;
    186186        vol_part_t *part;
    187         int rc;
     187        errno_t rc;
    188188
    189189        sid = IPC_GET_ARG1(*icall);
    … …  
    209209        vol_fstype_t fstype;
    210210        vol_label_supp_t vlsupp;
    211         int rc;
     211        errno_t rc;
    212212
    213213        fstype = IPC_GET_ARG1(*icall);
    … …  
    249249        vol_fstype_t fstype;
    250250        char *label;
    251         int rc;
     251        errno_t rc;
    252252
    253253        sid = IPC_GET_ARG1(*icall);
    … …  
    327327int main(int argc, char *argv[])
    328328{
    329         int rc;
     329        errno_t rc;
    330330
    331331        printf("%s: Volume service\n", NAME);
Note: See TracChangeset for help on using the changeset viewer.