From afd4189892f59a7cfdf8dee04bd9fd1dd77bff1e Mon Sep 17 00:00:00 2001 From: Justus Winter <4winter@informatik.uni-hamburg.de> Date: Sun, 22 Apr 2012 14:07:53 +0200 Subject: [PATCH] [PATCH 3/7] Use notmuch_database_destroy instead of notmuch_database_close --- 10/d9022333d6cbd6d3ec84cccbbd9a50658a8de9 | 183 ++++++++++++++++++++++ 1 file changed, 183 insertions(+) create mode 100644 10/d9022333d6cbd6d3ec84cccbbd9a50658a8de9 diff --git a/10/d9022333d6cbd6d3ec84cccbbd9a50658a8de9 b/10/d9022333d6cbd6d3ec84cccbbd9a50658a8de9 new file mode 100644 index 000000000..00950322a --- /dev/null +++ b/10/d9022333d6cbd6d3ec84cccbbd9a50658a8de9 @@ -0,0 +1,183 @@ +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 36A67431FD0 + for ; Sun, 22 Apr 2012 05:08:49 -0700 (PDT) +X-Virus-Scanned: Debian amavisd-new at olra.theworths.org +X-Spam-Flag: NO +X-Spam-Score: 0 +X-Spam-Level: +X-Spam-Status: No, score=0 tagged_above=-999 required=5 tests=[none] + 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 vssWHy357B77 for ; + Sun, 22 Apr 2012 05:08:48 -0700 (PDT) +Received: from mail.cryptobitch.de (cryptobitch.de [88.198.7.68]) + (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) + (No client certificate requested) + by olra.theworths.org (Postfix) with ESMTPS id 0F624431FDE + for ; Sun, 22 Apr 2012 05:08:46 -0700 (PDT) +Received: from mail.jade-hamburg.de (mail.jade-hamburg.de [85.183.11.228]) + (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) + (No client certificate requested) + by mail.cryptobitch.de (Postfix) with ESMTPSA id E4F865837D9 + for ; Sun, 22 Apr 2012 14:08:43 +0200 (CEST) +Received: by mail.jade-hamburg.de (Postfix, from userid 401) + id 2F8DCDF2A8; Sun, 22 Apr 2012 14:08:43 +0200 (CEST) +Received: from thinkbox.jade-hamburg.de (unknown [10.1.1.153]) + (using TLSv1 with cipher AES256-SHA (256/256 bits)) + (No client certificate requested) (Authenticated sender: teythoon) + by mail.jade-hamburg.de (Postfix) with ESMTPSA id 69207DF2A2; + Sun, 22 Apr 2012 14:08:28 +0200 (CEST) +Received: from teythoon by thinkbox.jade-hamburg.de with local (Exim 4.77) + (envelope-from ) + id 1SLvac-0007Ax-Pg; Sun, 22 Apr 2012 14:08:26 +0200 +From: Justus Winter <4winter@informatik.uni-hamburg.de> +To: notmuch@notmuchmail.org +Subject: [PATCH 3/7] Use notmuch_database_destroy instead of + notmuch_database_close +Date: Sun, 22 Apr 2012 14:07:53 +0200 +Message-Id: + <1335096477-27537-3-git-send-email-4winter@informatik.uni-hamburg.de> +X-Mailer: git-send-email 1.7.10 +In-Reply-To: + <1335096477-27537-1-git-send-email-4winter@informatik.uni-hamburg.de> +References: <20120422120620.26225.40778@thinkbox.jade-hamburg.de> + <1335096477-27537-1-git-send-email-4winter@informatik.uni-hamburg.de> +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, 22 Apr 2012 12:08:49 -0000 + +Adapt the notmuch binaries source to the notmuch_database_close split. + +Signed-off-by: Justus Winter <4winter@informatik.uni-hamburg.de> +--- + notmuch-count.c | 2 +- + notmuch-dump.c | 2 +- + notmuch-new.c | 2 +- + notmuch-reply.c | 2 +- + notmuch-restore.c | 2 +- + notmuch-search.c | 2 +- + notmuch-show.c | 2 +- + notmuch-tag.c | 2 +- + 8 files changed, 8 insertions(+), 8 deletions(-) + +diff --git a/notmuch-count.c b/notmuch-count.c +index b76690c..9c2ad7b 100644 +--- a/notmuch-count.c ++++ b/notmuch-count.c +@@ -107,7 +107,7 @@ notmuch_count_command (void *ctx, int argc, char *argv[]) + } + + notmuch_query_destroy (query); +- notmuch_database_close (notmuch); ++ notmuch_database_destroy (notmuch); + + return 0; + } +diff --git a/notmuch-dump.c b/notmuch-dump.c +index a735875..71ab0ea 100644 +--- a/notmuch-dump.c ++++ b/notmuch-dump.c +@@ -116,7 +116,7 @@ notmuch_dump_command (unused (void *ctx), int argc, char *argv[]) + fclose (output); + + notmuch_query_destroy (query); +- notmuch_database_close (notmuch); ++ notmuch_database_destroy (notmuch); + + return 0; + } +diff --git a/notmuch-new.c b/notmuch-new.c +index 4f13535..f078753 100644 +--- a/notmuch-new.c ++++ b/notmuch-new.c +@@ -1017,7 +1017,7 @@ notmuch_new_command (void *ctx, int argc, char *argv[]) + notmuch_status_to_string (ret)); + } + +- notmuch_database_close (notmuch); ++ notmuch_database_destroy (notmuch); + + if (run_hooks && !ret && !interrupted) + ret = notmuch_run_hook (db_path, "post-new"); +diff --git a/notmuch-reply.c b/notmuch-reply.c +index 0949d9f..da99a13 100644 +--- a/notmuch-reply.c ++++ b/notmuch-reply.c +@@ -755,7 +755,7 @@ notmuch_reply_command (void *ctx, int argc, char *argv[]) + return 1; + + notmuch_query_destroy (query); +- notmuch_database_close (notmuch); ++ notmuch_database_destroy (notmuch); + + if (params.cryptoctx) + g_object_unref(params.cryptoctx); +diff --git a/notmuch-restore.c b/notmuch-restore.c +index d3b9246..02b563c 100644 +--- a/notmuch-restore.c ++++ b/notmuch-restore.c +@@ -192,7 +192,7 @@ notmuch_restore_command (unused (void *ctx), int argc, char *argv[]) + if (line) + free (line); + +- notmuch_database_close (notmuch); ++ notmuch_database_destroy (notmuch); + if (input != stdin) + fclose (input); + +diff --git a/notmuch-search.c b/notmuch-search.c +index 1cc8430..7dfd270 100644 +--- a/notmuch-search.c ++++ b/notmuch-search.c +@@ -545,7 +545,7 @@ notmuch_search_command (void *ctx, int argc, char *argv[]) + } + + notmuch_query_destroy (query); +- notmuch_database_close (notmuch); ++ notmuch_database_destroy (notmuch); + + return ret; + } +diff --git a/notmuch-show.c b/notmuch-show.c +index da4a797..3b6667c 100644 +--- a/notmuch-show.c ++++ b/notmuch-show.c +@@ -1117,7 +1117,7 @@ notmuch_show_command (void *ctx, unused (int argc), unused (char *argv[])) + } + + notmuch_query_destroy (query); +- notmuch_database_close (notmuch); ++ notmuch_database_destroy (notmuch); + + if (params.cryptoctx) + g_object_unref(params.cryptoctx); +diff --git a/notmuch-tag.c b/notmuch-tag.c +index 05feed3..bd56fd1 100644 +--- a/notmuch-tag.c ++++ b/notmuch-tag.c +@@ -238,7 +238,7 @@ notmuch_tag_command (void *ctx, int argc, char *argv[]) + + ret = tag_query (ctx, notmuch, query_string, tag_ops, synchronize_flags); + +- notmuch_database_close (notmuch); ++ notmuch_database_destroy (notmuch); + + return ret; + } +-- +1.7.10 + -- 2.26.2