Commit 621ff94d authored by Eduardo Habkost's avatar Eduardo Habkost Committed by Markus Armbruster
Browse files

error: Remove NULL checks on error_propagate() calls 



error_propagate() already ignores local_err==NULL, so there's no
need to check it before calling.

Coccinelle patch used to perform the changes added to
scripts/coccinelle/error_propagate_null.cocci.

Reviewed-by: default avatarEric Blake <eblake@redhat.com>
Acked-by: default avatarCornelia Huck <cornelia.huck@de.ibm.com>
Reviewed-by: default avatarMarkus Armbruster <armbru@redhat.com>
Signed-off-by: default avatarEduardo Habkost <ehabkost@redhat.com>
Message-Id: <1465855078-19435-2-git-send-email-ehabkost@redhat.com>
Signed-off-by: default avatarMarkus Armbruster <armbru@redhat.com>
parent da002526

block.c

+5 −15
Original line number Diff line number Diff line
@@ -301,9 +301,7 @@ static void coroutine_fn bdrv_create_co_entry(void *opaque) 
    assert(cco->drv);



    ret = cco->drv->bdrv_create(cco->filename, cco->opts, &local_err);

    if (local_err) {

    error_propagate(&cco->err, local_err);

    }

    cco->ret = ret;

}
@@ -364,9 +362,7 @@ int bdrv_create_file(const char *filename, QemuOpts *opts, Error **errp) 
    }



    ret = bdrv_create(drv, filename, opts, &local_err);

    if (local_err) {

    error_propagate(errp, local_err);

    }

    return ret;

}
@@ -1763,18 +1759,14 @@ fail: 
    QDECREF(options);

    bs->options = NULL;

    bdrv_unref(bs);

    if (local_err) {

    error_propagate(errp, local_err);

    }

    return NULL;



close_and_fail:

    bdrv_unref(bs);

    QDECREF(snapshot_options);

    QDECREF(options);

    if (local_err) {

    error_propagate(errp, local_err);

    }

    return NULL;

}
@@ -3599,10 +3591,8 @@ void bdrv_img_create(const char *filename, const char *fmt, 
out:

    qemu_opts_del(opts);

    qemu_opts_free(create_opts);

    if (local_err) {

    error_propagate(errp, local_err);

}

}



AioContext *bdrv_get_aio_context(BlockDriverState *bs)

{

block/qcow2.c

+1 −3
Original line number Diff line number Diff line
@@ -2403,9 +2403,7 @@ static int qcow2_create(const char *filename, QemuOpts *opts, Error **errp) 
    ret = qcow2_create2(filename, size, backing_file, backing_fmt, flags,

                        cluster_size, prealloc, opts, version, refcount_order,

                        &local_err);

    if (local_err) {

    error_propagate(errp, local_err);

    }



finish:

    g_free(backing_file);

block/quorum.c

+1 −3
Original line number Diff line number Diff line
@@ -971,9 +971,7 @@ close_exit: 
exit:

    qemu_opts_del(opts);

    /* propagate error */

    if (local_err) {

    error_propagate(errp, local_err);

    }

    return ret;

}

block/raw-posix.c

+4 −12
Original line number Diff line number Diff line
@@ -587,9 +587,7 @@ static int raw_open(BlockDriverState *bs, QDict *options, int flags, 


    s->type = FTYPE_FILE;

    ret = raw_open_common(bs, options, flags, 0, &local_err);

    if (local_err) {

    error_propagate(errp, local_err);

    }

    return ret;

}
@@ -2236,9 +2234,7 @@ hdev_open_Mac_error: 


    ret = raw_open_common(bs, options, flags, 0, &local_err);

    if (ret < 0) {

        if (local_err) {

        error_propagate(errp, local_err);

        }

#if defined(__APPLE__) && defined(__MACH__)

        if (*bsd_path) {

            filename = bsd_path;
@@ -2450,9 +2446,7 @@ static int cdrom_open(BlockDriverState *bs, QDict *options, int flags, 


    /* open will not fail even if no CD is inserted, so add O_NONBLOCK */

    ret = raw_open_common(bs, options, flags, O_NONBLOCK, &local_err);

    if (local_err) {

    error_propagate(errp, local_err);

    }

    return ret;

}
@@ -2571,9 +2565,7 @@ static int cdrom_open(BlockDriverState *bs, QDict *options, int flags, 


    ret = raw_open_common(bs, options, flags, 0, &local_err);

    if (ret) {

        if (local_err) {

        error_propagate(errp, local_err);

        }

        return ret;

    }

block/raw_bsd.c

+1 −3
Original line number Diff line number Diff line
@@ -194,9 +194,7 @@ static int raw_create(const char *filename, QemuOpts *opts, Error **errp) 
    int ret;



    ret = bdrv_create_file(filename, opts, &local_err);

    if (local_err) {

    error_propagate(errp, local_err);

    }

    return ret;

}