From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:37279) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Zz9Wy-0003Jr-Hp for qemu-devel@nongnu.org; Wed, 18 Nov 2015 15:40:41 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Zz9Wx-0005dW-Gp for qemu-devel@nongnu.org; Wed, 18 Nov 2015 15:40:40 -0500 Received: from mx2.suse.de ([195.135.220.15]:49568) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Zz9Ww-0005dF-Up for qemu-devel@nongnu.org; Wed, 18 Nov 2015 15:40:39 -0500 Received: from relay1.suse.de (charybdis-ext.suse.de [195.135.220.254]) by mx2.suse.de (Postfix) with ESMTP id D50BFAD17 for ; Wed, 18 Nov 2015 20:40:14 +0000 (UTC) From: =?UTF-8?q?Andreas=20F=C3=A4rber?= Date: Wed, 18 Nov 2015 21:39:37 +0100 Message-Id: <1447879178-5440-10-git-send-email-afaerber@suse.de> In-Reply-To: <1447879178-5440-1-git-send-email-afaerber@suse.de> References: <1447879178-5440-1-git-send-email-afaerber@suse.de> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: quoted-printable Subject: [Qemu-devel] [PULL 09/10] qom: Clean up assertions to display values on failure List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: =?UTF-8?q?Andreas=20F=C3=A4rber?= Instead of using g_assert() for integer comparisons, use g_assert_cmpint() so that we can see the respective values. While at it, fix one stray indentation. Reviewed-by: Daniel P. Berrange Signed-off-by: Andreas F=C3=A4rber --- qom/object.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/qom/object.c b/qom/object.c index 19e7561..8c5c34e 100644 --- a/qom/object.c +++ b/qom/object.c @@ -265,7 +265,7 @@ static void type_initialize(TypeImpl *ti) GSList *e; int i; =20 - g_assert(parent->class_size <=3D ti->class_size); + g_assert_cmpint(parent->class_size, <=3D, ti->class_size); memcpy(ti->class, parent->class, parent->class_size); ti->class->interfaces =3D NULL; =20 @@ -347,9 +347,9 @@ void object_initialize_with_type(void *data, size_t s= ize, TypeImpl *type) g_assert(type !=3D NULL); type_initialize(type); =20 - g_assert(type->instance_size >=3D sizeof(Object)); + g_assert_cmpint(type->instance_size, >=3D, sizeof(Object)); g_assert(type->abstract =3D=3D false); - g_assert(size >=3D type->instance_size); + g_assert_cmpint(size, >=3D, type->instance_size); =20 memset(obj, 0, type->instance_size); obj->class =3D type->class; @@ -450,7 +450,7 @@ static void object_finalize(void *data) object_property_del_all(obj); object_deinit(obj, ti); =20 - g_assert(obj->ref =3D=3D 0); + g_assert_cmpint(obj->ref, =3D=3D, 0); if (obj->free) { obj->free(obj); } @@ -872,7 +872,7 @@ void object_ref(Object *obj) if (!obj) { return; } - atomic_inc(&obj->ref); + atomic_inc(&obj->ref); } =20 void object_unref(Object *obj) @@ -880,7 +880,7 @@ void object_unref(Object *obj) if (!obj) { return; } - g_assert(obj->ref > 0); + g_assert_cmpint(obj->ref, >, 0); =20 /* parent always holds a reference to its children */ if (atomic_fetch_dec(&obj->ref) =3D=3D 1) { --=20 2.6.2