From 11490583f6eab7cd2229c41138b2776c9949f6cc Mon Sep 17 00:00:00 2001 From: Jani Nikula Date: Mon, 16 Apr 2012 00:05:58 +0300 Subject: [PATCH] Re: [PATCH 4/4] Explicitly type void* pointers --- eb/06fccc8aa4cb1baf699d52fb7dc455108e9328 | 137 ++++++++++++++++++++++ 1 file changed, 137 insertions(+) create mode 100644 eb/06fccc8aa4cb1baf699d52fb7dc455108e9328 diff --git a/eb/06fccc8aa4cb1baf699d52fb7dc455108e9328 b/eb/06fccc8aa4cb1baf699d52fb7dc455108e9328 new file mode 100644 index 000000000..735cadb8f --- /dev/null +++ b/eb/06fccc8aa4cb1baf699d52fb7dc455108e9328 @@ -0,0 +1,137 @@ +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 C74A8431FAF + for ; Sun, 15 Apr 2012 14:06:04 -0700 (PDT) +X-Virus-Scanned: Debian amavisd-new at olra.theworths.org +X-Spam-Flag: NO +X-Spam-Score: -0.7 +X-Spam-Level: +X-Spam-Status: No, score=-0.7 tagged_above=-999 required=5 + tests=[RCVD_IN_DNSWL_LOW=-0.7] 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 Lotpo0hafFX1 for ; + Sun, 15 Apr 2012 14:06:04 -0700 (PDT) +Received: from mail-lb0-f181.google.com (mail-lb0-f181.google.com + [209.85.217.181]) (using TLSv1 with cipher RC4-SHA (128/128 bits)) + (No client certificate requested) + by olra.theworths.org (Postfix) with ESMTPS id B289D431FAE + for ; Sun, 15 Apr 2012 14:06:03 -0700 (PDT) +Received: by lbdb5 with SMTP id b5so603142lbd.26 + for ; Sun, 15 Apr 2012 14:06:02 -0700 (PDT) +X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; + d=google.com; s=20120113; + h=from:to:cc:subject:in-reply-to:references:date:message-id + :mime-version:content-type:x-gm-message-state; + bh=643sXsUpn03EVD9qiFkVQNYo+ddDnwzgzCFiCDn0rqI=; + b=hkphcYoRI0Dv0+6pAZSOv/fGMgio7t/4MXL3zHqHoxUUKpkVG9S1NdxqylXLcuWRFD + pY5UzwrlkHq+veueC3YgYxhdvMhqCyhwuOifkcRWYyczWGtB2DsWeIfbLD55599c+l9q + D0sgpn/QqDE8xh1djbte89YlNluTth6XgKYoYEg4IxUL8kiAGTUJ4I2rjx8yvtYuVq55 + 2wb8PQhlKg1Ii0WM9kAz0Nsa/qyz4ASkotuym3WJEfxCHSKT9y1NZA6y6SS0XMLiLvOo + +iGtpuojk4LAz386+L5BTE7ua6MCZXlWgiowVUSDUyW5aDnuYd7s73V1aZu/v/2wj4nF + fJ2A== +Received: by 10.152.128.137 with SMTP id no9mr7815927lab.2.1334523962127; + Sun, 15 Apr 2012 14:06:02 -0700 (PDT) +Received: from localhost (dsl-hkibrasgw4-fe50dc00-68.dhcp.inet.fi. + [80.220.80.68]) + by mx.google.com with ESMTPS id j6sm21791833lbm.1.2012.04.15.14.05.59 + (version=SSLv3 cipher=OTHER); Sun, 15 Apr 2012 14:06:00 -0700 (PDT) +From: Jani Nikula +To: Vladimir.Marek@oracle.com, notmuch@notmuchmail.org +Subject: Re: [PATCH 4/4] Explicitly type void* pointers +In-Reply-To: <1333966665-10469-5-git-send-email-Vladimir.Marek@oracle.com> +References: <1333966665-10469-1-git-send-email-Vladimir.Marek@oracle.com> + <1333966665-10469-5-git-send-email-Vladimir.Marek@oracle.com>User-Agent: + Notmuch/0.12+81~g839a805 (http://notmuchmail.org) Emacs/23.3.1 + (i686-pc-linux-gnu) +Date: Mon, 16 Apr 2012 00:05:58 +0300 +Message-ID: <87lilwk8nd.fsf@nikula.org> +MIME-Version: 1.0 +Content-Type: text/plain; charset=us-ascii +X-Gm-Message-State: + ALoCoQnPrayHBho5/JmIcwxA4TPB62A0fD94gLCZXClzG1VoG3Du+kvE4FgasXWV5FaqBFDk4eYy +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: Sun, 15 Apr 2012 21:06:04 -0000 + + +I tagged this patch notmuch::obsolete (see [1]) as the template +workaround was pushed to master (commit +de0557477d908be26615e8fda9f5eb62bed68b65). + +Jani. + + +[1] http://nmbug.tethera.net/status/ + + +On Mon, 09 Apr 2012, Vladimir.Marek@oracle.com wrote: +> 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 +> +> _______________________________________________ +> notmuch mailing list +> notmuch@notmuchmail.org +> http://notmuchmail.org/mailman/listinfo/notmuch -- 2.26.2