From ae9dc2ad85bfac7e9c8bbbd4507f5446d8fcd783 Mon Sep 17 00:00:00 2001 From: Justus Winter <4winter@informatik.uni-hamburg.de> Date: Wed, 21 Mar 2012 01:55:07 +0100 Subject: [PATCH] [PATCH 3/7] Use notmuch_database_destroy instead of notmuch_database_close --- 48/bc58be0a72c96a736b897813425c2f338401c5 | 183 ++++++++++++++++++++++ 1 file changed, 183 insertions(+) create mode 100644 48/bc58be0a72c96a736b897813425c2f338401c5 diff --git a/48/bc58be0a72c96a736b897813425c2f338401c5 b/48/bc58be0a72c96a736b897813425c2f338401c5 new file mode 100644 index 000000000..3c1f5b44b --- /dev/null +++ b/48/bc58be0a72c96a736b897813425c2f338401c5 @@ -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 38B86429E30 + for ; Tue, 20 Mar 2012 17:55:43 -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 qIkXTdOTJ3zz for ; + Tue, 20 Mar 2012 17:55:40 -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 016FA429E26 + for ; Tue, 20 Mar 2012 17:55:40 -0700 (PDT) +Received: from mail.jade-hamburg.de (unknown [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 7D0FF57678C + for ; Wed, 21 Mar 2012 01:55:38 +0100 (CET) +Received: by mail.jade-hamburg.de (Postfix, from userid 401) + id F17F6DF2A1; Wed, 21 Mar 2012 01:55:37 +0100 (CET) +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 C4C43DF2A3; + Wed, 21 Mar 2012 01:55:26 +0100 (CET) +Received: from teythoon by thinkbox.jade-hamburg.de with local (Exim 4.77) + (envelope-from ) + id 1SA9pk-0007vD-Uj; Wed, 21 Mar 2012 01:55:24 +0100 +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: Wed, 21 Mar 2012 01:55:07 +0100 +Message-Id: + <1332291311-28954-4-git-send-email-4winter@informatik.uni-hamburg.de> +X-Mailer: git-send-email 1.7.9.1 +In-Reply-To: + <1332291311-28954-1-git-send-email-4winter@informatik.uni-hamburg.de> +References: + <1332291311-28954-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: Wed, 21 Mar 2012 00:55:43 -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 46b76ae..ade9138 100644 +--- a/notmuch-count.c ++++ b/notmuch-count.c +@@ -100,7 +100,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 e2b6c25..1684b20 100644 +--- a/notmuch-reply.c ++++ b/notmuch-reply.c +@@ -804,7 +804,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 87d9772..60efc52 100644 +--- a/notmuch-restore.c ++++ b/notmuch-restore.c +@@ -184,7 +184,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 f6061e4..0b41573 100644 +--- a/notmuch-search.c ++++ b/notmuch-search.c +@@ -531,7 +531,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 ff9d427..c2eaa44 100644 +--- a/notmuch-show.c ++++ b/notmuch-show.c +@@ -1119,7 +1119,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 36b9b09..142005c 100644 +--- a/notmuch-tag.c ++++ b/notmuch-tag.c +@@ -227,7 +227,7 @@ notmuch_tag_command (void *ctx, int argc, char *argv[]) + } + + notmuch_query_destroy (query); +- notmuch_database_close (notmuch); ++ notmuch_database_destroy (notmuch); + + return interrupted; + } +-- +1.7.9.1 + -- 2.26.2