Re: [Patch v5 5/8] lib: add a log function with output to a string in notmuch_database_t

diff --git a/74/15c57c698f89bbf1dc7db537c93eab4101ec49 b/74/15c57c698f89bbf1dc7db537c93eab4101ec49
new file mode 100644 (file)
index 0000000..7491164
--- /dev/null
+++ b/74/15c57c698f89bbf1dc7db537c93eab4101ec49
@@ -0,0 +1,171 @@
+Return-Path: <tomi.ollila@iki.fi>\r
+X-Original-To: notmuch@notmuchmail.org\r
+Delivered-To: notmuch@notmuchmail.org\r
+Received: from localhost (localhost [127.0.0.1])\r
+       by olra.theworths.org (Postfix) with ESMTP id 6DD38431FC0\r
+       for <notmuch@notmuchmail.org>; Wed, 25 Mar 2015 09:48:09 -0700 (PDT)\r
+X-Virus-Scanned: Debian amavisd-new at olra.theworths.org\r
+X-Spam-Flag: NO\r
+X-Spam-Score: 2.438\r
+X-Spam-Level: **\r
+X-Spam-Status: No, score=2.438 tagged_above=-999 required=5\r
+       tests=[DNS_FROM_AHBL_RHSBL=2.438] autolearn=disabled\r
+Received: from olra.theworths.org ([127.0.0.1])\r
+       by localhost (olra.theworths.org [127.0.0.1]) (amavisd-new, port 10024)\r
+       with ESMTP id oYmNPJBJ0VIb for <notmuch@notmuchmail.org>;\r
+       Wed, 25 Mar 2015 09:48:06 -0700 (PDT)\r
+Received: from guru.guru-group.fi (guru.guru-group.fi [46.183.73.34])\r
+       by olra.theworths.org (Postfix) with ESMTP id E8A15431FBC\r
+       for <notmuch@notmuchmail.org>; Wed, 25 Mar 2015 09:48:05 -0700 (PDT)\r
+Received: from guru.guru-group.fi (localhost [IPv6:::1])\r
+       by guru.guru-group.fi (Postfix) with ESMTP id 6AD48100086;\r
+       Wed, 25 Mar 2015 18:47:44 +0200 (EET)\r
+From: Tomi Ollila <tomi.ollila@iki.fi>\r
+To: David Bremner <david@tethera.net>, David Bremner <david@tethera.net>,\r
+       notmuch@notmuchmail.org\r
+Subject: Re: [Patch v5 5/8] lib: add a log function with output to a string\r
+       in      notmuch_database_t\r
+In-Reply-To: <1427203451-1540-6-git-send-email-david@tethera.net>\r
+References: <1426352554-4383-10-git-send-email-david@tethera.net>\r
+       <1427203451-1540-1-git-send-email-david@tethera.net>\r
+       <1427203451-1540-6-git-send-email-david@tethera.net>\r
+User-Agent: Notmuch/0.19+92~g402df12 (http://notmuchmail.org) Emacs/24.3.1\r
+       (x86_64-unknown-linux-gnu)\r
+X-Face: HhBM'cA~<r"^Xv\KRN0P{vn'Y"Kd;zg_y3S[4)KSN~s?O\"QPoL\r
+       $[Xv_BD:i/F$WiEWax}R(MPS`^UaptOGD`*/=@\1lKoVa9tnrg0TW?"r7aRtgk[F\r
+       !)g;OY^,BjTbr)Np:%c_o'jj,Z\r
+Date: Wed, 25 Mar 2015 18:47:44 +0200\r
+Message-ID: <m28ueluiq7.fsf@guru.guru-group.fi>\r
+MIME-Version: 1.0\r
+Content-Type: text/plain\r
+X-BeenThere: notmuch@notmuchmail.org\r
+X-Mailman-Version: 2.1.13\r
+Precedence: list\r
+List-Id: "Use and development of the notmuch mail system."\r
+       <notmuch.notmuchmail.org>\r
+List-Unsubscribe: <http://notmuchmail.org/mailman/options/notmuch>,\r
+       <mailto:notmuch-request@notmuchmail.org?subject=unsubscribe>\r
+List-Archive: <http://notmuchmail.org/pipermail/notmuch>\r
+List-Post: <mailto:notmuch@notmuchmail.org>\r
+List-Help: <mailto:notmuch-request@notmuchmail.org?subject=help>\r
+List-Subscribe: <http://notmuchmail.org/mailman/listinfo/notmuch>,\r
+       <mailto:notmuch-request@notmuchmail.org?subject=subscribe>\r
+X-List-Received-Date: Wed, 25 Mar 2015 16:48:09 -0000\r
+\r
+On Tue, Mar 24 2015, David Bremner <david@tethera.net> wrote:\r
+\r
+> In principle in the future this could do something fancier than sprintf.\r
+\r
+It would be better talking of sNprintf -- it is more accurate and\r
+potentially more educational.\r
+\r
+Rest of the patches in this series OK\r
+\r
+> ---\r
+>  lib/database-private.h |  4 ++++\r
+>  lib/database.cc        | 24 ++++++++++++++++++++++++\r
+>  lib/notmuch-private.h  |  4 ++++\r
+>  lib/notmuch.h          |  7 +++++++\r
+>  4 files changed, 39 insertions(+)\r
+>\r
+> diff --git a/lib/database-private.h b/lib/database-private.h\r
+> index 6d6fa2c..24243db 100644\r
+> --- a/lib/database-private.h\r
+> +++ b/lib/database-private.h\r
+> @@ -154,6 +154,10 @@ struct _notmuch_database {\r
+>      unsigned int last_doc_id;\r
+>      uint64_t last_thread_id;\r
+>  \r
+> +    /* error reporting; this value persists only until the\r
+> +     * next library call. May be NULL */\r
+> +    char *status_string;\r
+> +\r
+>      Xapian::QueryParser *query_parser;\r
+>      Xapian::TermGenerator *term_gen;\r
+>      Xapian::ValueRangeProcessor *value_range_processor;\r
+> diff --git a/lib/database.cc b/lib/database.cc\r
+> index 36849d7..673561b 100644\r
+> --- a/lib/database.cc\r
+> +++ b/lib/database.cc\r
+> @@ -348,6 +348,23 @@ notmuch_status_to_string (notmuch_status_t status)\r
+>      }\r
+>  }\r
+>  \r
+> +void\r
+> +_notmuch_database_log (notmuch_database_t *notmuch,\r
+> +                  const char *format,\r
+> +                  ...)\r
+> +{\r
+> +    va_list va_args;\r
+> +\r
+> +    va_start (va_args, format);\r
+> +\r
+> +    if (notmuch->status_string)\r
+> +    talloc_free (notmuch->status_string);\r
+> +\r
+> +    notmuch->status_string = talloc_vasprintf (notmuch, format, va_args);\r
+> +\r
+> +    va_end (va_args);\r
+> +}\r
+> +\r
+>  static void\r
+>  find_doc_ids_for_term (notmuch_database_t *notmuch,\r
+>                     const char *term,\r
+> @@ -845,6 +862,7 @@ notmuch_database_open_verbose (const char *path,\r
+>  \r
+>      notmuch = talloc_zero (NULL, notmuch_database_t);\r
+>      notmuch->exception_reported = FALSE;\r
+> +    notmuch->status_string = NULL;\r
+>      notmuch->path = talloc_strdup (notmuch, path);\r
+>  \r
+>      if (notmuch->path[strlen (notmuch->path) - 1] == '/')\r
+> @@ -2530,3 +2548,9 @@ notmuch_database_get_all_tags (notmuch_database_t *db)\r
+>      return NULL;\r
+>      }\r
+>  }\r
+> +\r
+> +const char *\r
+> +notmuch_database_status_string (notmuch_database_t *notmuch)\r
+> +{\r
+> +    return notmuch->status_string;\r
+> +}\r
+> diff --git a/lib/notmuch-private.h b/lib/notmuch-private.h\r
+> index 8a1f2fa..7cb6fd4 100644\r
+> --- a/lib/notmuch-private.h\r
+> +++ b/lib/notmuch-private.h\r
+> @@ -190,6 +190,10 @@ _notmuch_message_id_compressed (void *ctx, const char *message_id);\r
+>  notmuch_status_t\r
+>  _notmuch_database_ensure_writable (notmuch_database_t *notmuch);\r
+>  \r
+> +void\r
+> +_notmuch_database_log (notmuch_database_t *notmuch,\r
+> +                   const char *format, ...);\r
+> +\r
+>  const char *\r
+>  _notmuch_database_relative_path (notmuch_database_t *notmuch,\r
+>                               const char *path);\r
+> diff --git a/lib/notmuch.h b/lib/notmuch.h\r
+> index c671d82..20c4e01 100644\r
+> --- a/lib/notmuch.h\r
+> +++ b/lib/notmuch.h\r
+> @@ -302,6 +302,13 @@ notmuch_database_open_verbose (const char *path,\r
+>                             char **error_message);\r
+>  \r
+>  /**\r
+> + * Retrieve last status string for given database.\r
+> + *\r
+> + */\r
+> +const char *\r
+> +notmuch_database_status_string (notmuch_database_t *notmuch);\r
+> +\r
+> +/**\r
+>   * Commit changes and close the given notmuch database.\r
+>   *\r
+>   * After notmuch_database_close has been called, calls to other\r
+> -- \r
+> 2.1.4\r
+>\r
+> _______________________________________________\r
+> notmuch mailing list\r
+> notmuch@notmuchmail.org\r
+> http://notmuchmail.org/mailman/listinfo/notmuch\r