From patchwork Tue Apr 17 19:36:17 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Luiz Capitulino X-Patchwork-Id: 153310 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id 1C7E0B7082 for ; Wed, 18 Apr 2012 06:18:09 +1000 (EST) Received: from localhost ([::1]:37341 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1SKEEC-0000Gf-A6 for incoming@patchwork.ozlabs.org; Tue, 17 Apr 2012 15:38:16 -0400 Received: from eggs.gnu.org ([208.118.235.92]:37438) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1SKECg-0005Sg-0b for qemu-devel@nongnu.org; Tue, 17 Apr 2012 15:36:46 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1SKECe-0008Qu-Ad for qemu-devel@nongnu.org; Tue, 17 Apr 2012 15:36:41 -0400 Received: from mx1.redhat.com ([209.132.183.28]:23866) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1SKECe-0008Qd-25 for qemu-devel@nongnu.org; Tue, 17 Apr 2012 15:36:40 -0400 Received: from int-mx09.intmail.prod.int.phx2.redhat.com (int-mx09.intmail.prod.int.phx2.redhat.com [10.5.11.22]) by mx1.redhat.com (8.14.4/8.14.4) with ESMTP id q3HJabYW017669 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK); Tue, 17 Apr 2012 15:36:37 -0400 Received: from localhost (ovpn-113-173.phx2.redhat.com [10.3.113.173]) by int-mx09.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with ESMTP id q3HJaaH1011188; Tue, 17 Apr 2012 15:36:36 -0400 From: Luiz Capitulino To: qemu-devel@nongnu.org Date: Tue, 17 Apr 2012 16:36:17 -0300 Message-Id: <1334691381-7666-15-git-send-email-lcapitulino@redhat.com> In-Reply-To: <1334691381-7666-1-git-send-email-lcapitulino@redhat.com> References: <1334691381-7666-1-git-send-email-lcapitulino@redhat.com> X-Scanned-By: MIMEDefang 2.68 on 10.5.11.22 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 209.132.183.28 Cc: pbonzini@redhat.com, aliguori@us.ibm.com, mdroth@linux.vnet.ibm.com, armbru@redhat.com Subject: [Qemu-devel] [PATCH 14/18] qstring: introduce qstring_len() X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Signed-off-by: Luiz Capitulino --- qstring.c | 9 +++++++++ qstring.h | 1 + tests/check-qstring.c | 17 +++++++++++++++++ 3 files changed, 27 insertions(+) diff --git a/qstring.c b/qstring.c index b7e12e4..b1bf975 100644 --- a/qstring.c +++ b/qstring.c @@ -32,6 +32,15 @@ QString *qstring_new(void) } /** + * qstring_len(): Get string length + * + */ +size_t qstring_len(const QString *qstring) +{ + return qstring->length; +} + +/** * qstring_from_substr(): Create a new QString from a C string substring * * Return string reference diff --git a/qstring.h b/qstring.h index 84ccd96..d1c8a07 100644 --- a/qstring.h +++ b/qstring.h @@ -24,6 +24,7 @@ typedef struct QString { } QString; QString *qstring_new(void); +size_t qstring_len(const QString *qstring); QString *qstring_from_str(const char *str); QString *qstring_from_substr(const char *str, int start, int end); const char *qstring_get_str(const QString *qstring); diff --git a/tests/check-qstring.c b/tests/check-qstring.c index addad6c..8e99c62 100644 --- a/tests/check-qstring.c +++ b/tests/check-qstring.c @@ -81,6 +81,22 @@ static void qstring_from_substr_test(void) QDECREF(qs); } +static void qstring_len_test(void) +{ + const char *str = "virtualization"; + QString *qs; + + qs = qstring_new(); + g_assert(qstring_len(qs) == 0); + + qstring_append(qs, "QEMU"); + g_assert(qstring_len(qs) == 4); + QDECREF(qs); + + qs = qstring_from_str(str); + g_assert(qstring_len(qs) == strlen(str)); + QDECREF(qs); +} static void qobject_to_qstring_test(void) { @@ -101,6 +117,7 @@ int main(int argc, char **argv) g_test_add_func("/public/get_str", qstring_get_str_test); g_test_add_func("/public/append_chr", qstring_append_chr_test); g_test_add_func("/public/from_substr", qstring_from_substr_test); + g_test_add_func("/public/len", qstring_len_test); g_test_add_func("/public/to_qstring", qobject_to_qstring_test); return g_test_run();