Changeset 5a6cc679 in mainline for uspace/lib/label/test/label.c


Ignore:
Timestamp:
2018-01-31T02:21:24Z (8 years ago)
Author:
Jenda <jenda.jzqk73@…>
Branches:
lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export
Children:
a0a9cc2
Parents:
132ab5d1
Message:

Merge commit '50f19b7ee8e94570b5c63896736c4eb49cfa18db' into forwardport

Not all ints are converted to errno_t in xhci tree yet, however it compiles and works :)

File:
1 edited

Legend:

Unmodified
Added
Removed

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

    r132ab5d1 r5a6cc679  
    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.