Commit 37509233 authored by Fam Zheng's avatar Fam Zheng Committed by Markus Armbruster
Browse files

crypto: Make errp the last parameter of functions 



Move opaque to 2nd instead of the 2nd to last, so that compilers help
check with the conversion.

Signed-off-by: default avatarFam Zheng <famz@redhat.com>
Message-Id: <20170421122710.15373-7-famz@redhat.com>
Reviewed-by: default avatarMarkus Armbruster <armbru@redhat.com>
Reviewed-by: default avatarEric Blake <eblake@redhat.com>
[Commit message typo corrected]
Signed-off-by: default avatarMarkus Armbruster <armbru@redhat.com>
parent 9217283d

block/crypto.c

+6 −6
Original line number Diff line number Diff line
@@ -56,11 +56,11 @@ static int block_crypto_probe_generic(QCryptoBlockFormat format, 




static ssize_t block_crypto_read_func(QCryptoBlock *block,

                                      void *opaque,

                                      size_t offset,

                                      uint8_t *buf,

                                      size_t buflen,

                                      Error **errp,

                                      void *opaque)

                                      Error **errp)

{

    BlockDriverState *bs = opaque;

    ssize_t ret;
@@ -83,11 +83,11 @@ struct BlockCryptoCreateData { 




static ssize_t block_crypto_write_func(QCryptoBlock *block,

                                       void *opaque,

                                       size_t offset,

                                       const uint8_t *buf,

                                       size_t buflen,

                                       Error **errp,

                                       void *opaque)

                                       Error **errp)

{

    struct BlockCryptoCreateData *data = opaque;

    ssize_t ret;
@@ -102,9 +102,9 @@ static ssize_t block_crypto_write_func(QCryptoBlock *block, 




static ssize_t block_crypto_init_func(QCryptoBlock *block,

                                      void *opaque,

                                      size_t headerlen,

                                      Error **errp,

                                      void *opaque)

                                      Error **errp)

{

    struct BlockCryptoCreateData *data = opaque;

    int ret;

crypto/block-luks.c

+9 −12
Original line number Diff line number Diff line
@@ -473,10 +473,10 @@ qcrypto_block_luks_load_key(QCryptoBlock *block, 
     * then encrypted.

     */

    rv = readfunc(block,

                  opaque,

                  slot->key_offset * QCRYPTO_BLOCK_LUKS_SECTOR_SIZE,

                  splitkey, splitkeylen,

                  errp,

                  opaque);

                  errp);

    if (rv < 0) {

        goto cleanup;

    }
@@ -676,11 +676,10 @@ qcrypto_block_luks_open(QCryptoBlock *block, 


    /* Read the entire LUKS header, minus the key material from

     * the underlying device */

    rv = readfunc(block, 0,

    rv = readfunc(block, opaque, 0,

                  (uint8_t *)&luks->header,

                  sizeof(luks->header),

                  errp,

                  opaque);

                  errp);

    if (rv < 0) {

        ret = rv;

        goto fail;
@@ -1246,7 +1245,7 @@ qcrypto_block_luks_create(QCryptoBlock *block, 
        QCRYPTO_BLOCK_LUKS_SECTOR_SIZE;



    /* Reserve header space to match payload offset */

    initfunc(block, block->payload_offset, &local_err, opaque);

    initfunc(block, opaque, block->payload_offset, &local_err);

    if (local_err) {

        error_propagate(errp, local_err);

        goto error;
@@ -1268,11 +1267,10 @@ qcrypto_block_luks_create(QCryptoBlock *block, 




    /* Write out the partition header and key slot headers */

    writefunc(block, 0,

    writefunc(block, opaque, 0,

              (const uint8_t *)&luks->header,

              sizeof(luks->header),

              &local_err,

              opaque);

              &local_err);



    /* Delay checking local_err until we've byte-swapped */
@@ -1297,12 +1295,11 @@ qcrypto_block_luks_create(QCryptoBlock *block, 


    /* Write out the master key material, starting at the

     * sector immediately following the partition header. */

    if (writefunc(block,

    if (writefunc(block, opaque,

                  luks->header.key_slots[0].key_offset *

                  QCRYPTO_BLOCK_LUKS_SECTOR_SIZE,

                  splitkey, splitkeylen,

                  errp,

                  opaque) != splitkeylen) {

                  errp) != splitkeylen) {

        goto error;

    }

include/crypto/block.h

+6 −6
Original line number Diff line number Diff line
@@ -30,23 +30,23 @@ typedef struct QCryptoBlock QCryptoBlock; 
 * and QCryptoBlockOpenOptions in qapi/crypto.json */



typedef ssize_t (*QCryptoBlockReadFunc)(QCryptoBlock *block,

                                        void *opaque,

                                        size_t offset,

                                        uint8_t *buf,

                                        size_t buflen,

                                        Error **errp,

                                        void *opaque);

                                        Error **errp);



typedef ssize_t (*QCryptoBlockInitFunc)(QCryptoBlock *block,

                                        void *opaque,

                                        size_t headerlen,

                                        Error **errp,

                                        void *opaque);

                                        Error **errp);



typedef ssize_t (*QCryptoBlockWriteFunc)(QCryptoBlock *block,

                                         void *opaque,

                                         size_t offset,

                                         const uint8_t *buf,

                                         size_t buflen,

                                         Error **errp,

                                         void *opaque);

                                         Error **errp);



/**

 * qcrypto_block_has_format:

tests/test-crypto-block.c

+6 −6
Original line number Diff line number Diff line
@@ -187,11 +187,11 @@ static struct QCryptoBlockTestData { 




static ssize_t test_block_read_func(QCryptoBlock *block,

                                    void *opaque,

                                    size_t offset,

                                    uint8_t *buf,

                                    size_t buflen,

                                    Error **errp,

                                    void *opaque)

                                    Error **errp)

{

    Buffer *header = opaque;
@@ -204,9 +204,9 @@ static ssize_t test_block_read_func(QCryptoBlock *block, 




static ssize_t test_block_init_func(QCryptoBlock *block,

                                    void *opaque,

                                    size_t headerlen,

                                    Error **errp,

                                    void *opaque)

                                    Error **errp)

{

    Buffer *header = opaque;
@@ -219,11 +219,11 @@ static ssize_t test_block_init_func(QCryptoBlock *block, 




static ssize_t test_block_write_func(QCryptoBlock *block,

                                     void *opaque,

                                     size_t offset,

                                     const uint8_t *buf,

                                     size_t buflen,

                                     Error **errp,

                                     void *opaque)

                                     Error **errp)

{

    Buffer *header = opaque;