Changeset b7fd2a0 in mainline for uspace/lib/label


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/label
Files:
9 edited

Legend:

Unmodified
Added
Removed

  • uspace/lib/label/include/label/empty.h

    r36f0738 rb7fd2a0  
    4141#include <types/liblabel.h>
    4242
    43 extern int label_bd_is_empty(label_bd_t *, bool *);
    44 extern int label_bd_empty(label_bd_t *);
    45 extern int label_part_empty(label_part_t *);
     43extern errno_t label_bd_is_empty(label_bd_t *, bool *);
     44extern errno_t label_bd_empty(label_bd_t *);
     45extern errno_t label_part_empty(label_part_t *);
    4646
    4747#endif

  • uspace/lib/label/include/label/label.h

    r36f0738 rb7fd2a0  
    4040#include <types/liblabel.h>
    4141
    42 extern int label_open(label_bd_t *, label_t **);
    43 extern int label_create(label_bd_t *, label_type_t, label_t **);
     42extern errno_t label_open(label_bd_t *, label_t **);
     43extern errno_t label_create(label_bd_t *, label_type_t, label_t **);
    4444extern void label_close(label_t *);
    45 extern int label_destroy(label_t *);
    46 extern int label_get_info(label_t *, label_info_t *);
     45extern errno_t label_destroy(label_t *);
     46extern errno_t label_get_info(label_t *, label_info_t *);
    4747
    4848extern label_part_t *label_part_first(label_t *);
    … …  
    5050extern void label_part_get_info(label_part_t *, label_part_info_t *);
    5151
    52 extern int label_part_create(label_t *, label_part_spec_t *,
     52extern errno_t label_part_create(label_t *, label_part_spec_t *,
    5353    label_part_t **);
    54 extern int label_part_destroy(label_part_t *);
     54extern errno_t label_part_destroy(label_part_t *);
    5555extern void label_pspec_init(label_part_spec_t *);
    56 extern int label_suggest_ptype(label_t *, label_pcnt_t, label_ptype_t *);
     56extern errno_t label_suggest_ptype(label_t *, label_pcnt_t, label_ptype_t *);
    5757
    5858#endif

  • uspace/lib/label/include/types/liblabel.h

    r36f0738 rb7fd2a0  
    5454/** Ops for individual label type */
    5555typedef struct {
    56         int (*open)(label_bd_t *, label_t **);
    57         int (*create)(label_bd_t *, label_t **);
     56        errno_t (*open)(label_bd_t *, label_t **);
     57        errno_t (*create)(label_bd_t *, label_t **);
    5858        void (*close)(label_t *);
    59         int (*destroy)(label_t *);
    60         int (*get_info)(label_t *, label_info_t *);
     59        errno_t (*destroy)(label_t *);
     60        errno_t (*get_info)(label_t *, label_info_t *);
    6161        label_part_t *(*part_first)(label_t *);
    6262        label_part_t *(*part_next)(label_part_t *);
    6363        void (*part_get_info)(label_part_t *, label_part_info_t *);
    64         int (*part_create)(label_t *, label_part_spec_t *, label_part_t **);
    65         int (*part_destroy)(label_part_t *);
    66         int (*suggest_ptype)(label_t *, label_pcnt_t, label_ptype_t *);
     64        errno_t (*part_create)(label_t *, label_part_spec_t *, label_part_t **);
     65        errno_t (*part_destroy)(label_part_t *);
     66        errno_t (*suggest_ptype)(label_t *, label_pcnt_t, label_ptype_t *);
    6767} label_ops_t;
    6868
    … …  
    144144struct label_bd_ops {
    145145        /** Get block size */
    146         int (*get_bsize)(void *, size_t *);
     146        errno_t (*get_bsize)(void *, size_t *);
    147147        /** Get number of blocks */
    148         int (*get_nblocks)(void *, aoff64_t *);
     148        errno_t (*get_nblocks)(void *, aoff64_t *);
    149149        /** Read blocks */
    150         int (*read)(void *, aoff64_t, size_t, void *);
     150        errno_t (*read)(void *, aoff64_t, size_t, void *);
    151151        /** Write blocks */
    152         int (*write)(void *, aoff64_t, size_t, const void *);
     152        errno_t (*write)(void *, aoff64_t, size_t, const void *);
    153153};
    154154

  • uspace/lib/label/src/dummy.c

    r36f0738 rb7fd2a0  
    4040#include "dummy.h"
    4141
    42 static int dummy_open(label_bd_t *, label_t **);
    43 static int dummy_create(label_bd_t *, label_t **);
     42static errno_t dummy_open(label_bd_t *, label_t **);
     43static errno_t dummy_create(label_bd_t *, label_t **);
    4444static void dummy_close(label_t *);
    45 static int dummy_destroy(label_t *);
    46 static int dummy_get_info(label_t *, label_info_t *);
     45static errno_t dummy_destroy(label_t *);
     46static errno_t dummy_get_info(label_t *, label_info_t *);
    4747static label_part_t *dummy_part_first(label_t *);
    4848static label_part_t *dummy_part_next(label_part_t *);
    4949static void dummy_part_get_info(label_part_t *, label_part_info_t *);
    50 static int dummy_part_create(label_t *, label_part_spec_t *, label_part_t **);
    51 static int dummy_part_destroy(label_part_t *);
    52 static int dummy_suggest_ptype(label_t *, label_pcnt_t, label_ptype_t *);
     50static errno_t dummy_part_create(label_t *, label_part_spec_t *, label_part_t **);
     51static errno_t dummy_part_destroy(label_part_t *);
     52static errno_t dummy_suggest_ptype(label_t *, label_pcnt_t, label_ptype_t *);
    5353
    5454label_ops_t dummy_label_ops = {
    … …  
    6666};
    6767
    68 static int dummy_open(label_bd_t *bd, label_t **rlabel)
     68static errno_t dummy_open(label_bd_t *bd, label_t **rlabel)
    6969{
    7070        label_t *label = NULL;
    … …  
    7373        aoff64_t nblocks;
    7474        uint64_t ba_min, ba_max;
    75         int rc;
     75        errno_t rc;
    7676
    7777        rc = bd->ops->get_bsize(bd->arg, &bsize);
    … …  
    128128}
    129129
    130 static int dummy_create(label_bd_t *bd, label_t **rlabel)
     130static errno_t dummy_create(label_bd_t *bd, label_t **rlabel)
    131131{
    132132        return ENOTSUP;
    … …  
    148148}
    149149
    150 static int dummy_destroy(label_t *label)
    151 {
    152         return ENOTSUP;
    153 }
    154 
    155 static int dummy_get_info(label_t *label, label_info_t *linfo)
     150static errno_t dummy_destroy(label_t *label)
     151{
     152        return ENOTSUP;
     153}
     154
     155static errno_t dummy_get_info(label_t *label, label_info_t *linfo)
    156156{
    157157        memset(linfo, 0, sizeof(label_info_t));
    … …  
    193193}
    194194
    195 static int dummy_part_create(label_t *label, label_part_spec_t *pspec,
     195static errno_t dummy_part_create(label_t *label, label_part_spec_t *pspec,
    196196    label_part_t **rpart)
    197197{
    … …  
    199199}
    200200
    201 static int dummy_part_destroy(label_part_t *part)
    202 {
    203         return ENOTSUP;
    204 }
    205 
    206 static int dummy_suggest_ptype(label_t *label, label_pcnt_t pcnt,
     201static errno_t dummy_part_destroy(label_part_t *part)
     202{
     203        return ENOTSUP;
     204}
     205
     206static errno_t dummy_suggest_ptype(label_t *label, label_pcnt_t pcnt,
    207207    label_ptype_t *ptype)
    208208{

  • uspace/lib/label/src/empty.c

    r36f0738 rb7fd2a0  
    9797}
    9898
    99 int label_bd_is_empty(label_bd_t *bd, bool *rempty)
    100 {
    101         int rc;
     99errno_t label_bd_is_empty(label_bd_t *bd, bool *rempty)
     100{
     101        errno_t rc;
    102102        void *buf = NULL;
    103103        aoff64_t nblocks;
    … …  
    174174}
    175175
    176 int label_bd_empty(label_bd_t *bd)
    177 {
    178         int rc;
     176errno_t label_bd_empty(label_bd_t *bd)
     177{
     178        errno_t rc;
    179179        void *buf = NULL;
    180180        aoff64_t nblocks;
    … …  
    236236}
    237237
    238 int label_part_empty(label_part_t *part)
    239 {
    240         int rc;
     238errno_t label_part_empty(label_part_t *part)
     239{
     240        errno_t rc;
    241241        void *buf = NULL;
    242242        aoff64_t block0;

  • uspace/lib/label/src/gpt.c

    r36f0738 rb7fd2a0  
    4646#include "gpt.h"
    4747
    48 static int gpt_open(label_bd_t *, label_t **);
    49 static int gpt_create(label_bd_t *, label_t **);
     48static errno_t gpt_open(label_bd_t *, label_t **);
     49static errno_t gpt_create(label_bd_t *, label_t **);
    5050static void gpt_close(label_t *);
    51 static int gpt_destroy(label_t *);
    52 static int gpt_get_info(label_t *, label_info_t *);
     51static errno_t gpt_destroy(label_t *);
     52static errno_t gpt_get_info(label_t *, label_info_t *);
    5353static label_part_t *gpt_part_first(label_t *);
    5454static label_part_t *gpt_part_next(label_part_t *);
    5555static void gpt_part_get_info(label_part_t *, label_part_info_t *);
    56 static int gpt_part_create(label_t *, label_part_spec_t *, label_part_t **);
    57 static int gpt_part_destroy(label_part_t *);
    58 static int gpt_suggest_ptype(label_t *, label_pcnt_t, label_ptype_t *);
    59 
    60 static int gpt_check_free_idx(label_t *, int);
    61 static int gpt_check_free_range(label_t *, uint64_t, uint64_t);
     56static errno_t gpt_part_create(label_t *, label_part_spec_t *, label_part_t **);
     57static errno_t gpt_part_destroy(label_part_t *);
     58static errno_t gpt_suggest_ptype(label_t *, label_pcnt_t, label_ptype_t *);
     59
     60static errno_t gpt_check_free_idx(label_t *, int);
     61static errno_t gpt_check_free_range(label_t *, uint64_t, uint64_t);
    6262
    6363static void gpt_unused_pte(gpt_entry_t *);
    64 static int gpt_part_to_pte(label_part_t *, gpt_entry_t *);
    65 static int gpt_pte_to_part(label_t *, gpt_entry_t *, int);
    66 static int gpt_pte_update(label_t *, gpt_entry_t *, int);
    67 
    68 static int gpt_update_pt_crc(label_t *, uint32_t);
     64static errno_t gpt_part_to_pte(label_part_t *, gpt_entry_t *);
     65static errno_t gpt_pte_to_part(label_t *, gpt_entry_t *, int);
     66static errno_t gpt_pte_update(label_t *, gpt_entry_t *, int);
     67
     68static errno_t gpt_update_pt_crc(label_t *, uint32_t);
    6969static void gpt_hdr_compute_crc(gpt_header_t *, size_t);
    70 static int gpt_hdr_get_crc(gpt_header_t *, size_t, uint32_t *);
    71 
    72 static int gpt_pmbr_create(label_bd_t *, size_t, uint64_t);
    73 static int gpt_pmbr_destroy(label_bd_t *, size_t);
     70static errno_t gpt_hdr_get_crc(gpt_header_t *, size_t, uint32_t *);
     71
     72static errno_t gpt_pmbr_create(label_bd_t *, size_t, uint64_t);
     73static errno_t gpt_pmbr_destroy(label_bd_t *, size_t);
    7474
    7575const uint8_t efi_signature[8] = {
    … …  
    9292};
    9393
    94 static int gpt_open(label_bd_t *bd, label_t **rlabel)
     94static errno_t gpt_open(label_bd_t *bd, label_t **rlabel)
    9595{
    9696        label_t *label = NULL;
    … …  
    111111        uint32_t hdr_crc;
    112112        int i, j;
    113         int rc;
     113        errno_t rc;
    114114
    115115        gpt_hdr[0] = NULL;
    … …  
    345345}
    346346
    347 static int gpt_create(label_bd_t *bd, label_t **rlabel)
     347static errno_t gpt_create(label_bd_t *bd, label_t **rlabel)
    348348{
    349349        label_t *label = NULL;
    … …  
    362362        uuid_t disk_uuid;
    363363        int i, j;
    364         int rc;
     364        errno_t rc;
    365365
    366366        rc = bd->ops->get_bsize(bd->arg, &bsize);
    … …  
    510510}
    511511
    512 static int gpt_destroy(label_t *label)
     512static errno_t gpt_destroy(label_t *label)
    513513{
    514514        gpt_header_t *gpt_hdr = NULL;
    … …  
    516516        label_part_t *part;
    517517        int i;
    518         int rc;
     518        errno_t rc;
    519519
    520520        part = gpt_part_first(label);
    … …  
    580580}
    581581
    582 static int gpt_get_info(label_t *label, label_info_t *linfo)
     582static errno_t gpt_get_info(label_t *label, label_info_t *linfo)
    583583{
    584584        memset(linfo, 0, sizeof(label_info_t));
    … …  
    624624}
    625625
    626 static int gpt_part_create(label_t *label, label_part_spec_t *pspec,
     626static errno_t gpt_part_create(label_t *label, label_part_spec_t *pspec,
    627627    label_part_t **rpart)
    628628{
    629629        label_part_t *part;
    630630        gpt_entry_t pte;
    631         int rc;
     631        errno_t rc;
    632632
    633633        part = calloc(1, sizeof(label_part_t));
    … …  
    696696}
    697697
    698 static int gpt_part_destroy(label_part_t *part)
     698static errno_t gpt_part_destroy(label_part_t *part)
    699699{
    700700        gpt_entry_t pte;
    701         int rc;
     701        errno_t rc;
    702702
    703703        /* Prepare unused partition table entry */
    … …  
    715715}
    716716
    717 static int gpt_suggest_ptype(label_t *label, label_pcnt_t pcnt,
     717static errno_t gpt_suggest_ptype(label_t *label, label_pcnt_t pcnt,
    718718    label_ptype_t *ptype)
    719719{
    720720        const char *ptid;
    721         int rc;
     721        errno_t rc;
    722722
    723723        ptid = NULL;
    … …  
    748748
    749749/** Verify that the specified index is valid and free. */
    750 static int gpt_check_free_idx(label_t *label, int index)
     750static errno_t gpt_check_free_idx(label_t *label, int index)
    751751{
    752752        label_part_t *part;
    … …  
    771771}
    772772
    773 static int gpt_check_free_range(label_t *label, uint64_t block0,
     773static errno_t gpt_check_free_range(label_t *label, uint64_t block0,
    774774    uint64_t nblocks)
    775775{
    … …  
    796796}
    797797
    798 static int gpt_part_to_pte(label_part_t *part, gpt_entry_t *pte)
     798static errno_t gpt_part_to_pte(label_part_t *part, gpt_entry_t *pte)
    799799{
    800800        uint64_t eblock;
    … …  
    814814}
    815815
    816 static int gpt_pte_to_part(label_t *label, gpt_entry_t *pte, int index)
     816static errno_t gpt_pte_to_part(label_t *label, gpt_entry_t *pte, int index)
    817817{
    818818        label_part_t *part;
    … …  
    856856 * @a pte.
    857857 */
    858 static int gpt_pte_update(label_t *label, gpt_entry_t *pte, int index)
     858static errno_t gpt_pte_update(label_t *label, gpt_entry_t *pte, int index)
    859859{
    860860        size_t pos;
    … …  
    866866        uint32_t crc;
    867867        int i;
    868         int rc;
     868        errno_t rc;
    869869
    870870        /* Byte offset of partition entry */
    … …  
    921921}
    922922
    923 static int gpt_update_pt_crc(label_t *label, uint32_t crc)
     923static errno_t gpt_update_pt_crc(label_t *label, uint32_t crc)
    924924{
    925925        gpt_header_t *gpt_hdr;
    926         int rc;
     926        errno_t rc;
    927927        int i;
    928928
    … …  
    968968}
    969969
    970 static int gpt_hdr_get_crc(gpt_header_t *hdr, size_t hdr_size, uint32_t *crc)
     970static errno_t gpt_hdr_get_crc(gpt_header_t *hdr, size_t hdr_size, uint32_t *crc)
    971971{
    972972        gpt_header_t *c;
    … …  
    985985
    986986/** Create GPT Protective MBR */
    987 static int gpt_pmbr_create(label_bd_t *bd, size_t bsize, uint64_t nblocks)
     987static errno_t gpt_pmbr_create(label_bd_t *bd, size_t bsize, uint64_t nblocks)
    988988{
    989989        mbr_br_block_t *pmbr = NULL;
    990990        uint64_t pmbr_nb;
    991         int rc;
     991        errno_t rc;
    992992
    993993        pmbr = calloc(1, bsize);
    … …  
    10231023
    10241024/** Destroy GPT Protective MBR */
    1025 static int gpt_pmbr_destroy(label_bd_t *bd, size_t bsize)
     1025static errno_t gpt_pmbr_destroy(label_bd_t *bd, size_t bsize)
    10261026{
    10271027        mbr_br_block_t *pmbr = NULL;
    1028         int rc;
     1028        errno_t rc;
    10291029
    10301030        pmbr = calloc(1, bsize);

  • uspace/lib/label/src/label.c

    r36f0738 rb7fd2a0  
    5151};
    5252
    53 int label_open(label_bd_t *bd, label_t **rlabel)
     53errno_t label_open(label_bd_t *bd, label_t **rlabel)
    5454{
    5555        label_ops_t **ops;
    56         int rc;
     56        errno_t rc;
    5757
    5858        ops = &probe_list[0];
    … …  
    6767}
    6868
    69 int label_create(label_bd_t *bd, label_type_t ltype, label_t **rlabel)
     69errno_t label_create(label_bd_t *bd, label_type_t ltype, label_t **rlabel)
    7070{
    7171        label_ops_t *ops = NULL;
    … …  
    9696}
    9797
    98 int label_destroy(label_t *label)
     98errno_t label_destroy(label_t *label)
    9999{
    100100        return label->ops->destroy(label);
    101101}
    102102
    103 int label_get_info(label_t *label, label_info_t *linfo)
     103errno_t label_get_info(label_t *label, label_info_t *linfo)
    104104{
    105105        return label->ops->get_info(label, linfo);
    … …  
    121121}
    122122
    123 int label_part_create(label_t *label, label_part_spec_t *pspec,
     123errno_t label_part_create(label_t *label, label_part_spec_t *pspec,
    124124    label_part_t **rpart)
    125125{
    … …  
    127127}
    128128
    129 int label_part_destroy(label_part_t *part)
     129errno_t label_part_destroy(label_part_t *part)
    130130{
    131131        return part->label->ops->part_destroy(part);
    … …  
    137137}
    138138
    139 int label_suggest_ptype(label_t *label, label_pcnt_t pcnt,
     139errno_t label_suggest_ptype(label_t *label, label_pcnt_t pcnt,
    140140    label_ptype_t *ptype)
    141141{

  • uspace/lib/label/src/mbr.c

    r36f0738 rb7fd2a0  
    4343#include "mbr.h"
    4444
    45 static int mbr_open(label_bd_t *, label_t **);
    46 static int mbr_open_ext(label_t *);
    47 static int mbr_create(label_bd_t *, label_t **);
     45static errno_t mbr_open(label_bd_t *, label_t **);
     46static errno_t mbr_open_ext(label_t *);
     47static errno_t mbr_create(label_bd_t *, label_t **);
    4848static void mbr_close(label_t *);
    49 static int mbr_destroy(label_t *);
    50 static int mbr_get_info(label_t *, label_info_t *);
     49static errno_t mbr_destroy(label_t *);
     50static errno_t mbr_get_info(label_t *, label_info_t *);
    5151static label_part_t *mbr_part_first(label_t *);
    5252static label_part_t *mbr_part_next(label_part_t *);
    5353static void mbr_part_get_info(label_part_t *, label_part_info_t *);
    54 static int mbr_part_create(label_t *, label_part_spec_t *, label_part_t **);
    55 static int mbr_part_destroy(label_part_t *);
    56 static int mbr_suggest_ptype(label_t *, label_pcnt_t, label_ptype_t *);
    57 
    58 static int mbr_check_free_idx(label_t *, int);
    59 static int mbr_check_free_pri_range(label_t *, uint64_t, uint64_t);
    60 static int mbr_check_free_log_range(label_t *, uint64_t, uint64_t, uint64_t);
     54static errno_t mbr_part_create(label_t *, label_part_spec_t *, label_part_t **);
     55static errno_t mbr_part_destroy(label_part_t *);
     56static errno_t mbr_suggest_ptype(label_t *, label_pcnt_t, label_ptype_t *);
     57
     58static errno_t mbr_check_free_idx(label_t *, int);
     59static errno_t mbr_check_free_pri_range(label_t *, uint64_t, uint64_t);
     60static errno_t mbr_check_free_log_range(label_t *, uint64_t, uint64_t, uint64_t);
    6161
    6262static void mbr_unused_pte(mbr_pte_t *);
    63 static int mbr_part_to_pte(label_part_t *, mbr_pte_t *);
    64 static int mbr_pte_to_part(label_t *, mbr_pte_t *, int);
    65 static int mbr_pte_to_log_part(label_t *, uint64_t, mbr_pte_t *);
     63static errno_t mbr_part_to_pte(label_part_t *, mbr_pte_t *);
     64static errno_t mbr_pte_to_part(label_t *, mbr_pte_t *, int);
     65static errno_t mbr_pte_to_log_part(label_t *, uint64_t, mbr_pte_t *);
    6666static void mbr_log_part_to_ptes(label_part_t *, mbr_pte_t *, mbr_pte_t *);
    67 static int mbr_pte_update(label_t *, mbr_pte_t *, int);
    68 static int mbr_log_part_insert(label_t *, label_part_t *);
    69 static int mbr_ebr_create(label_t *, label_part_t *);
    70 static int mbr_ebr_delete(label_t *, label_part_t *);
    71 static int mbr_ebr_update_next(label_t *, label_part_t *);
     67static errno_t mbr_pte_update(label_t *, mbr_pte_t *, int);
     68static errno_t mbr_log_part_insert(label_t *, label_part_t *);
     69static errno_t mbr_ebr_create(label_t *, label_part_t *);
     70static errno_t mbr_ebr_delete(label_t *, label_part_t *);
     71static errno_t mbr_ebr_update_next(label_t *, label_part_t *);
    7272static void mbr_update_log_indices(label_t *);
    7373
    … …  
    8686};
    8787
    88 static int mbr_open(label_bd_t *bd, label_t **rlabel)
     88static errno_t mbr_open(label_bd_t *bd, label_t **rlabel)
    8989{
    9090        label_t *label = NULL;
    … …  
    9696        aoff64_t nblocks;
    9797        uint32_t entry;
    98         int rc;
     98        errno_t rc;
    9999
    100100        rc = bd->ops->get_bsize(bd->arg, &bsize);
    … …  
    202202
    203203/** Open extended partition */
    204 static int mbr_open_ext(label_t *label)
     204static errno_t mbr_open_ext(label_t *label)
    205205{
    206206        mbr_br_block_t *ebr = NULL;
    … …  
    215215        uint64_t pnblocks;
    216216        uint64_t ep_b0;
    217         int rc;
     217        errno_t rc;
    218218
    219219        ebr = calloc(1, label->block_size);
    … …  
    300300}
    301301
    302 static int mbr_create(label_bd_t *bd, label_t **rlabel)
     302static errno_t mbr_create(label_bd_t *bd, label_t **rlabel)
    303303{
    304304        label_t *label = NULL;
    … …  
    307307        size_t bsize;
    308308        int i;
    309         int rc;
     309        errno_t rc;
    310310
    311311        rc = bd->ops->get_bsize(bd->arg, &bsize);
    … …  
    389389}
    390390
    391 static int mbr_destroy(label_t *label)
     391static errno_t mbr_destroy(label_t *label)
    392392{
    393393        mbr_br_block_t *mbr = NULL;
    394394        label_part_t *part;
    395         int rc;
     395        errno_t rc;
    396396
    397397        part = mbr_part_first(label);
    … …  
    428428}
    429429
    430 static int mbr_get_info(label_t *label, label_info_t *linfo)
     430static errno_t mbr_get_info(label_t *label, label_info_t *linfo)
    431431{
    432432        memset(linfo, 0, sizeof(label_info_t));
    … …  
    546546}
    547547
    548 static int mbr_part_create(label_t *label, label_part_spec_t *pspec,
     548static errno_t mbr_part_create(label_t *label, label_part_spec_t *pspec,
    549549    label_part_t **rpart)
    550550{
    … …  
    553553        label_part_t *next;
    554554        mbr_pte_t pte;
    555         int rc;
     555        errno_t rc;
    556556
    557557        if (pspec->ptype.fmt != lptf_num)
    … …  
    694694}
    695695
    696 static int mbr_part_destroy(label_part_t *part)
     696static errno_t mbr_part_destroy(label_part_t *part)
    697697{
    698698        mbr_pte_t pte;
    … …  
    700700        label_part_t *next;
    701701        uint64_t ep_b0;
    702         int rc;
     702        errno_t rc;
    703703
    704704        if (link_used(&part->lpri)) {
    … …  
    776776}
    777777
    778 static int mbr_suggest_ptype(label_t *label, label_pcnt_t pcnt,
     778static errno_t mbr_suggest_ptype(label_t *label, label_pcnt_t pcnt,
    779779    label_ptype_t *ptype)
    780780{
    … …  
    813813
    814814/** Verify that the specified index is valid and free. */
    815 static int mbr_check_free_idx(label_t *label, int index)
     815static errno_t mbr_check_free_idx(label_t *label, int index)
    816816{
    817817        label_part_t *part;
    … …  
    830830}
    831831
    832 static int mbr_check_free_pri_range(label_t *label, uint64_t block0,
     832static errno_t mbr_check_free_pri_range(label_t *label, uint64_t block0,
    833833    uint64_t nblocks)
    834834{
    … …  
    850850}
    851851
    852 static int mbr_check_free_log_range(label_t *label, uint64_t hdr_blocks,
     852static errno_t mbr_check_free_log_range(label_t *label, uint64_t hdr_blocks,
    853853    uint64_t block0, uint64_t nblocks)
    854854{
    … …  
    877877}
    878878
    879 static int mbr_part_to_pte(label_part_t *part, mbr_pte_t *pte)
     879static errno_t mbr_part_to_pte(label_part_t *part, mbr_pte_t *pte)
    880880{
    881881        if ((part->block0 >> 32) != 0)
    … …  
    893893}
    894894
    895 static int mbr_pte_to_part(label_t *label, mbr_pte_t *pte, int index)
     895static errno_t mbr_pte_to_part(label_t *label, mbr_pte_t *pte, int index)
    896896{
    897897        label_part_t *part;
    … …  
    931931}
    932932
    933 static int mbr_pte_to_log_part(label_t *label, uint64_t ebr_b0,
     933static errno_t mbr_pte_to_log_part(label_t *label, uint64_t ebr_b0,
    934934    mbr_pte_t *pte)
    935935{
    … …  
    10091009 * @a pte.
    10101010 */
    1011 static int mbr_pte_update(label_t *label, mbr_pte_t *pte, int index)
     1011static errno_t mbr_pte_update(label_t *label, mbr_pte_t *pte, int index)
    10121012{
    10131013        mbr_br_block_t *br;
    1014         int rc;
     1014        errno_t rc;
    10151015
    10161016        br = calloc(1, label->block_size);
    … …  
    10401040
    10411041/** Insert logical partition into logical partition list. */
    1042 static int mbr_log_part_insert(label_t *label, label_part_t *part)
     1042static errno_t mbr_log_part_insert(label_t *label, label_part_t *part)
    10431043{
    10441044        label_part_t *cur;
    … …  
    10661066 * @return EOK on success or non-zero error code
    10671067 */
    1068 static int mbr_ebr_create(label_t *label, label_part_t *part)
     1068static errno_t mbr_ebr_create(label_t *label, label_part_t *part)
    10691069{
    10701070        mbr_br_block_t *br;
    10711071        uint64_t ba;
    1072         int rc;
     1072        errno_t rc;
    10731073
    10741074        br = calloc(1, label->block_size);
    … …  
    10991099}
    11001100
    1101 static int mbr_ebr_delete(label_t *label, label_part_t *part)
     1101static errno_t mbr_ebr_delete(label_t *label, label_part_t *part)
    11021102{
    11031103        mbr_br_block_t *br;
    11041104        uint64_t ba;
    1105         int rc;
     1105        errno_t rc;
    11061106
    11071107        br = calloc(1, label->block_size);
    … …  
    11251125
    11261126/** Update 'next' PTE in EBR of partition. */
    1127 static int mbr_ebr_update_next(label_t *label, label_part_t *part)
     1127static errno_t mbr_ebr_update_next(label_t *label, label_part_t *part)
    11281128{
    11291129        mbr_br_block_t *br;
    11301130        uint64_t ba;
    11311131        uint16_t sgn;
    1132         int rc;
     1132        errno_t rc;
    11331133
    11341134        ba = part->block0 - part->hdr_blocks;

  • uspace/lib/label/test/label.c

    r36f0738 rb7fd2a0  
    3737PCUT_TEST_SUITE(label);
    3838
    39 static int label_test_get_bsize(void *, size_t *);
    40 static int label_test_get_nblocks(void *, aoff64_t *);
    41 static int label_test_read(void *, aoff64_t, size_t, void *);
    42 static int label_test_write(void *, aoff64_t, size_t, const void *);
     39static errno_t label_test_get_bsize(void *, size_t *);
     40static errno_t label_test_get_nblocks(void *, aoff64_t *);
     41static errno_t label_test_read(void *, aoff64_t, size_t, void *);
     42static errno_t label_test_write(void *, aoff64_t, size_t, const void *);
    4343
    4444label_bd_ops_t label_test_ops = {
    … …  
    6767 * @param rbd Place to store pointer to new pretended block device
    6868 */
    69 static int test_bd_create(size_t bsize, aoff64_t nblocks, test_bd_t **rbd)
     69static errno_t test_bd_create(size_t bsize, aoff64_t nblocks, test_bd_t **rbd)
    7070{
    7171        test_bd_t *bd;
    … …  
    9999
    100100/** Get block size wrapper for liblabel */
    101 static int label_test_get_bsize(void *arg, size_t *bsize)
     101static errno_t label_test_get_bsize(void *arg, size_t *bsize)
    102102{
    103103        test_bd_t *bd = (test_bd_t *)arg;
    … …  
    108108
    109109/** Get number of blocks wrapper for liblabel */
    110 static int label_test_get_nblocks(void *arg, aoff64_t *nblocks)
     110static errno_t label_test_get_nblocks(void *arg, aoff64_t *nblocks)
    111111{
    112112        test_bd_t *bd = (test_bd_t *)arg;
    … …  
    117117
    118118/** Read blocks wrapper for liblabel */
    119 static int label_test_read(void *arg, aoff64_t ba, size_t cnt, void *buf)
     119static errno_t label_test_read(void *arg, aoff64_t ba, size_t cnt, void *buf)
    120120{
    121121        test_bd_t *bd = (test_bd_t *)arg;
    … …  
    129129
    130130/** Write blocks wrapper for liblabel */
    131 static int label_test_write(void *arg, aoff64_t ba, size_t cnt, const void *data)
     131static errno_t label_test_write(void *arg, aoff64_t ba, size_t cnt, const void *data)
    132132{
    133133        test_bd_t *bd = (test_bd_t *)arg;
    … …  
    146146        label_part_t *part;
    147147        test_bd_t *bd = NULL;
    148         int rc;
     148        errno_t rc;
    149149
    150150        rc = test_bd_create(test_block_size, test_nblocks, &bd);
    … …  
    181181        label_part_t *part;
    182182        test_bd_t *bd = NULL;
    183         int rc;
     183        errno_t rc;
    184184
    185185        rc = test_bd_create(test_block_size, test_nblocks, &bd);
    … …  
    242242        label_part_t *part;
    243243        test_bd_t *bd = NULL;
    244         int rc;
     244        errno_t rc;
    245245
    246246        rc = test_bd_create(test_block_size, test_nblocks, &bd);
    … …  
    304304        label_ptype_t ptype;
    305305        test_bd_t *bd = NULL;
    306         int rc;
     306        errno_t rc;
    307307
    308308        rc = test_bd_create(test_block_size, test_nblocks, &bd);
    … …  
    393393        label_part_info_t pinfo, lpinfo, epinfo;
    394394        test_bd_t *bd = NULL;
    395         int rc;
     395        errno_t rc;
    396396
    397397        rc = test_bd_create(test_block_size, test_nblocks, &bd);
    … …  
    531531        label_ptype_t ptype;
    532532        test_bd_t *bd = NULL;
    533         int rc;
     533        errno_t rc;
    534534
    535535        rc = test_bd_create(test_block_size, test_nblocks, &bd);
Note: See TracChangeset for help on using the changeset viewer.