Return-Path: X-Original-To: notmuch@notmuchmail.org Delivered-To: notmuch@notmuchmail.org Received: from localhost (localhost [127.0.0.1]) by olra.theworths.org (Postfix) with ESMTP id 5F225403508 for ; Mon, 9 Apr 2012 03:18:46 -0700 (PDT) X-Virus-Scanned: Debian amavisd-new at olra.theworths.org X-Spam-Flag: NO X-Spam-Score: -2.299 X-Spam-Level: X-Spam-Status: No, score=-2.299 tagged_above=-999 required=5 tests=[RCVD_IN_DNSWL_MED=-2.3, UNPARSEABLE_RELAY=0.001] autolearn=disabled Received: from olra.theworths.org ([127.0.0.1]) by localhost (olra.theworths.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id PI0aTh3NkeYc for ; Mon, 9 Apr 2012 03:18:45 -0700 (PDT) Received: from rcsinet14.oracle.com (rcsinet14.oracle.com [148.87.113.126]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) by olra.theworths.org (Postfix) with ESMTPS id B0184416464 for ; Mon, 9 Apr 2012 03:18:45 -0700 (PDT) Received: from rcsinet15.oracle.com (rcsinet15.oracle.com [148.87.113.117]) by rcsinet14.oracle.com (Sentrion-MTA-4.2.2/Sentrion-MTA-4.2.2) with ESMTP id q39AGcAV026355 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK) for ; Mon, 9 Apr 2012 10:16:38 GMT Received: from ucsinet22.oracle.com (ucsinet22.oracle.com [156.151.31.94]) by rcsinet15.oracle.com (Sentrion-MTA-4.2.2/Sentrion-MTA-4.2.2) with ESMTP id q39AIhBo010144 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK); Mon, 9 Apr 2012 10:18:44 GMT Received: from acsmt357.oracle.com (acsmt357.oracle.com [141.146.40.157]) by ucsinet22.oracle.com (8.14.4+Sun/8.14.4) with ESMTP id q39AIg4c023878 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=NO); Mon, 9 Apr 2012 10:18:43 GMT Received: from abhmt120.oracle.com (abhmt120.oracle.com [141.146.116.72]) by acsmt357.oracle.com (8.12.11.20060308/8.12.11) with ESMTP id q39AIgCd003302; Mon, 9 Apr 2012 05:18:42 -0500 Received: from pub.czech.sun.com (/10.163.20.32) by default (Oracle Beehive Gateway v4.0) with ESMTP ; Mon, 09 Apr 2012 03:18:42 -0700 From: Vladimir.Marek@oracle.com To: notmuch@notmuchmail.org Subject: [PATCH 4/4] Explicitly type void* pointers Date: Mon, 9 Apr 2012 12:17:45 +0200 Message-Id: <1333966665-10469-5-git-send-email-Vladimir.Marek@oracle.com> X-Mailer: git-send-email 1.7.3.2 In-Reply-To: <1333966665-10469-1-git-send-email-Vladimir.Marek@oracle.com> References: <1333966665-10469-1-git-send-email-Vladimir.Marek@oracle.com> X-Source-IP: ucsinet22.oracle.com [156.151.31.94] X-CT-RefId: str=0001.0A090201.4F82B784.0060,ss=1,re=0.000,fgs=0 Cc: Vladimir Marek X-BeenThere: notmuch@notmuchmail.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: "Use and development of the notmuch mail system." List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 09 Apr 2012 10:18:46 -0000 From: Vladimir Marek Signed-off-by: Vladimir Marek --- lib/database.cc | 2 +- lib/message.cc | 2 +- lib/thread.cc | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/lib/database.cc b/lib/database.cc index 16c4354..3c82632 100644 --- a/lib/database.cc +++ b/lib/database.cc @@ -1361,7 +1361,7 @@ _resolve_message_id_to_thread_id (notmuch_database_t *notmuch, return status; if (message) { - *thread_id_ret = talloc_steal (ctx, + *thread_id_ret = (const char*)talloc_steal (ctx, notmuch_message_get_thread_id (message)); notmuch_message_destroy (message); diff --git a/lib/message.cc b/lib/message.cc index 0075425..d56d442 100644 --- a/lib/message.cc +++ b/lib/message.cc @@ -220,7 +220,7 @@ _notmuch_message_create_for_message_id (notmuch_database_t *notmuch, message_id, &message); if (message) - return talloc_steal (notmuch, message); + return (notmuch_message_t*) talloc_steal (notmuch, message); else if (*status_ret) return NULL; diff --git a/lib/thread.cc b/lib/thread.cc index e976d64..d41ff3e 100644 --- a/lib/thread.cc +++ b/lib/thread.cc @@ -225,7 +225,7 @@ _thread_add_message (notmuch_thread_t *thread, char *clean_author; _notmuch_message_list_add_message (thread->message_list, - talloc_steal (thread, message)); + (_notmuch_message*)talloc_steal (thread, message)); thread->total_messages++; g_hash_table_insert (thread->message_hash, -- 1.7.3.2