Changeset b7fd2a0 in mainline for uspace/lib/label/src/mbr.c


Ignore:
Timestamp:
2018-01-13T03:10:29Z (6 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.

File:
1 edited

Legend:

Unmodified
Added
Removed

  • 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;
Note: See TracChangeset for help on using the changeset viewer.