Commit b396733d authored by Bandan Das's avatar Bandan Das Committed by Gerd Hoffmann
Browse files

usb-mtp: remove usb_mtp_object_free_one 



This function is used in the delete path only and can
be replaced by a call to usb_mtp_object_free.

Reviewed-by: default avatarPeter Maydell <peter.maydell@linaro.org>
Signed-off-by: default avatarBandan Das <bsd@redhat.com>
Message-Id: <20190401211712.19012-3-bsd@redhat.com>
Signed-off-by: default avatarGerd Hoffmann <kraxel@redhat.com>
parent 4bc15916

hw/usb/dev-mtp.c

+2 −12
Original line number Diff line number Diff line
@@ -1150,16 +1150,6 @@ enum { 
    DELETE_PARTIAL = (DELETE_FAILURE | DELETE_SUCCESS),

};



/* Assumes that children, if any, have been already freed */

static void usb_mtp_object_free_one(MTPState *s, MTPObject *o)

{

    assert(o->nchildren == 0);

    QTAILQ_REMOVE(&s->objects, o, next);

    g_free(o->name);

    g_free(o->path);

    g_free(o);

}



static int usb_mtp_deletefn(MTPState *s, MTPObject *o, uint32_t trans)

{

    MTPObject *iter, *iter2;
@@ -1181,14 +1171,14 @@ static int usb_mtp_deletefn(MTPState *s, MTPObject *o, uint32_t trans) 
        if (remove(o->path)) {

            ret |= DELETE_FAILURE;

        } else {

            usb_mtp_object_free_one(s, o);

            usb_mtp_object_free(s, o);

            ret |= DELETE_SUCCESS;

        }

    } else if (o->format == FMT_ASSOCIATION) {

        if (rmdir(o->path)) {

            ret |= DELETE_FAILURE;

        } else {

            usb_mtp_object_free_one(s, o);

            usb_mtp_object_free(s, o);

            ret |= DELETE_SUCCESS;

        }

    }