Re: [PATCH 1/2] test: fix whitespace/indentation in symbol-test

diff --git a/3e/ca1828b0a33e62ac46f74521e71da47f643ea4 b/3e/ca1828b0a33e62ac46f74521e71da47f643ea4
new file mode 100644 (file)
index 0000000..c34b2ff
--- /dev/null
+++ b/3e/ca1828b0a33e62ac46f74521e71da47f643ea4
@@ -0,0 +1,113 @@
+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 arlo.cworth.org (Postfix) with ESMTP id 399286DE1AEA\r
+ for <notmuch@notmuchmail.org>; Sun,  6 Sep 2015 02:25:27 -0700 (PDT)\r
+X-Virus-Scanned: Debian amavisd-new at cworth.org\r
+X-Spam-Flag: NO\r
+X-Spam-Score: 0.807\r
+X-Spam-Level: \r
+X-Spam-Status: No, score=0.807 tagged_above=-999 required=5 tests=[AWL=0.155, \r
+ SPF_NEUTRAL=0.652] autolearn=disabled\r
+Received: from arlo.cworth.org ([127.0.0.1])\r
+ by localhost (arlo.cworth.org [127.0.0.1]) (amavisd-new, port 10024)\r
+ with ESMTP id 5nlXCF0pOJbo for <notmuch@notmuchmail.org>;\r
+ Sun,  6 Sep 2015 02:25:24 -0700 (PDT)\r
+Received: from guru.guru-group.fi (guru.guru-group.fi [46.183.73.34])\r
+ by arlo.cworth.org (Postfix) with ESMTP id 596D46DE1AD8\r
+ for <notmuch@notmuchmail.org>; Sun,  6 Sep 2015 02:25:24 -0700 (PDT)\r
+Received: from guru.guru-group.fi (localhost [IPv6:::1])\r
+ by guru.guru-group.fi (Postfix) with ESMTP id 03268100033;\r
+ Sun,  6 Sep 2015 12:23:58 +0300 (EEST)\r
+From: Tomi Ollila <tomi.ollila@iki.fi>\r
+To: Jani Nikula <jani@nikula.org>, notmuch@notmuchmail.org\r
+Subject: Re: [PATCH 1/2] test: fix whitespace/indentation in symbol-test\r
+In-Reply-To: <1441392555-20056-1-git-send-email-jani@nikula.org>\r
+References: <1441392555-20056-1-git-send-email-jani@nikula.org>\r
+User-Agent: Notmuch/0.20.2+68~g0c35549 (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: Sun, 06 Sep 2015 12:23:57 +0300\r
+Message-ID: <m2k2s3295e.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.18\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: Sun, 06 Sep 2015 09:25:27 -0000\r
+\r
+On Fri, Sep 04 2015, Jani Nikula <jani@nikula.org> wrote:\r
+\r
+> Not of much consequence, but makes it nicer to do further edits.\r
+> ---\r
+\r
+These 2 patches LGTM ! +1! :D\r
+\r
+>  test/symbol-test.cc | 34 ++++++++++++++++++----------------\r
+>  1 file changed, 18 insertions(+), 16 deletions(-)\r
+>\r
+> diff --git a/test/symbol-test.cc b/test/symbol-test.cc\r
+> index fb77b418a1a8..77dbc1af44b2 100644\r
+> --- a/test/symbol-test.cc\r
+> +++ b/test/symbol-test.cc\r
+> @@ -3,23 +3,25 @@\r
+>  #include <xapian.h>\r
+>  #include <notmuch.h>\r
+>  \r
+> +int main (int argc, char** argv)\r
+> +{\r
+> +    notmuch_database_t *notmuch;\r
+> +    char *message = NULL;\r
+>  \r
+> -int main(int argc, char** argv) {\r
+> -  notmuch_database_t *notmuch;\r
+> -  char *message = NULL;\r
+> +    if (notmuch_database_open_verbose (argv[1], NOTMUCH_DATABASE_MODE_READ_ONLY,\r
+> +                                   &notmuch, &message)) {\r
+> +    if (message) {\r
+> +        fputs (message, stderr);\r
+> +        free (message);\r
+> +    }\r
+> +    }\r
+>  \r
+> -  if (notmuch_database_open_verbose  (argv[1], NOTMUCH_DATABASE_MODE_READ_ONLY, &notmuch, &message))\r
+> -      if (message) {\r
+> -      fputs (message, stderr);\r
+> -      free (message);\r
+> -      }\r
+> +    try {\r
+> +    (void) new Xapian::WritableDatabase (argv[2], Xapian::DB_OPEN);\r
+> +    } catch (const Xapian::Error &error) {\r
+> +    printf("caught %s\n", error.get_msg().c_str());\r
+> +    return 0;\r
+> +    }\r
+>  \r
+> -  try {\r
+> -    (void) new Xapian::WritableDatabase(argv[2], Xapian::DB_OPEN);\r
+> -  } catch (const Xapian::Error &error) {\r
+> -    printf("caught %s\n", error.get_msg().c_str());\r
+> -    return 0;\r
+> -  }\r
+> -\r
+> -  return 1;\r
+> +    return 1;\r
+>  }\r
+> -- \r
+> 2.1.4\r
+>\r
+> _______________________________________________\r
+> notmuch mailing list\r
+> notmuch@notmuchmail.org\r
+> http://notmuchmail.org/mailman/listinfo/notmuch\r