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

diff --git a/c8/2adb4e70758e4f61435ed1abdb3df7fb72f136 b/c8/2adb4e70758e4f61435ed1abdb3df7fb72f136
new file mode 100644 (file)
index 0000000..1e915ad
--- /dev/null
+++ b/c8/2adb4e70758e4f61435ed1abdb3df7fb72f136
@@ -0,0 +1,116 @@
+Return-Path: <jani@nikula.org>\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 18B6F6DE14C7\r
+ for <notmuch@notmuchmail.org>; Fri,  4 Sep 2015 11:49:23 -0700 (PDT)\r
+X-Virus-Scanned: Debian amavisd-new at cworth.org\r
+X-Spam-Flag: NO\r
+X-Spam-Score: -0.492\r
+X-Spam-Level: \r
+X-Spam-Status: No, score=-0.492 tagged_above=-999 required=5 tests=[AWL=0.228,\r
+  RCVD_IN_DNSWL_LOW=-0.7, RCVD_IN_MSPIKE_H3=-0.01, RCVD_IN_MSPIKE_WL=-0.01]\r
+ 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 oadNhCM86-GP for <notmuch@notmuchmail.org>;\r
+ Fri,  4 Sep 2015 11:49:21 -0700 (PDT)\r
+Received: from mail-wi0-f169.google.com (mail-wi0-f169.google.com\r
+ [209.85.212.169])\r
+ by arlo.cworth.org (Postfix) with ESMTPS id 2698E6DE1472\r
+ for <notmuch@notmuchmail.org>; Fri,  4 Sep 2015 11:49:21 -0700 (PDT)\r
+Received: by wicge5 with SMTP id ge5so26321556wic.0\r
+ for <notmuch@notmuchmail.org>; Fri, 04 Sep 2015 11:49:19 -0700 (PDT)\r
+X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;\r
+ d=1e100.net; s=20130820;\r
+ h=x-gm-message-state:from:to:cc:subject:date:message-id;\r
+ bh=EJrIS+RlC8R1aZRdV96IhDZjsS8aBaYHdtNfC3m9h2E=;\r
+ b=avn7uOG4IJdtphiSuq4vUCvQxWQie2A2ulPG0i6b1W6FfMhu0EGfwPQzMLQY0UjCQU\r
+ YnxvpF7xttdChuNCUNkWVzuvPI4YLy4ZElDf6X7Uyo5JknD3C4HuHojRVcQwPLPnTZ9Q\r
+ a/XE053YIxgkOoSegLKiYz+m34ANOJCwEcgmG3xIj72ZqBpzwV0vDzJF5GkI5JQDC1Ab\r
+ rvP4dj88nzjPNrZp45wQ4OUOk/8AmPRhxa0WDzFA6hyUT5iMI+4ULsobwzaICPhmlYYN\r
+ VSOZ6AtWxVAMkeXj8UW+zWheeGy6+bFWW6R7zi1EhfHfKVyBQjtMijHt8UVPn6LdmetT\r
+ 9YHQ==\r
+X-Gm-Message-State:\r
+ ALoCoQmy/g9/IYu4fowlhv39qwBe4JYoKHYloBeV9Fjee6jmD1kj6WLMGY3CKrTrM28swKClNqmT\r
+X-Received: by 10.194.21.98 with SMTP id u2mr10167602wje.141.1441392559750;\r
+ Fri, 04 Sep 2015 11:49:19 -0700 (PDT)\r
+Received: from localhost (mobile-access-bcee4f-131.dhcp.inet.fi.\r
+ [188.238.79.131])\r
+ by smtp.gmail.com with ESMTPSA id u8sm5672719wia.19.2015.09.04.11.49.18\r
+ (version=TLSv1/SSLv3 cipher=OTHER);\r
+ Fri, 04 Sep 2015 11:49:19 -0700 (PDT)\r
+From: Jani Nikula <jani@nikula.org>\r
+To: notmuch@notmuchmail.org\r
+Subject: [PATCH 1/2] test: fix whitespace/indentation in symbol-test\r
+Date: Fri,  4 Sep 2015 21:49:14 +0300\r
+Message-Id: <1441392555-20056-1-git-send-email-jani@nikula.org>\r
+X-Mailer: git-send-email 2.1.4\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: Fri, 04 Sep 2015 18:49:23 -0000\r
+\r
+Not of much consequence, but makes it nicer to do further edits.\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