From 63b7823ff39b7f594effe84b1702d3d06234b20c Mon Sep 17 00:00:00 2001 From: Jani Nikula Date: Fri, 4 Sep 2015 21:49:14 +0300 Subject: [PATCH] [PATCH 1/2] test: fix whitespace/indentation in symbol-test --- c8/2adb4e70758e4f61435ed1abdb3df7fb72f136 | 116 ++++++++++++++++++++++ 1 file changed, 116 insertions(+) create mode 100644 c8/2adb4e70758e4f61435ed1abdb3df7fb72f136 diff --git a/c8/2adb4e70758e4f61435ed1abdb3df7fb72f136 b/c8/2adb4e70758e4f61435ed1abdb3df7fb72f136 new file mode 100644 index 000000000..1e915ad48 --- /dev/null +++ b/c8/2adb4e70758e4f61435ed1abdb3df7fb72f136 @@ -0,0 +1,116 @@ +Return-Path: +X-Original-To: notmuch@notmuchmail.org +Delivered-To: notmuch@notmuchmail.org +Received: from localhost (localhost [127.0.0.1]) + by arlo.cworth.org (Postfix) with ESMTP id 18B6F6DE14C7 + for ; Fri, 4 Sep 2015 11:49:23 -0700 (PDT) +X-Virus-Scanned: Debian amavisd-new at cworth.org +X-Spam-Flag: NO +X-Spam-Score: -0.492 +X-Spam-Level: +X-Spam-Status: No, score=-0.492 tagged_above=-999 required=5 tests=[AWL=0.228, + RCVD_IN_DNSWL_LOW=-0.7, RCVD_IN_MSPIKE_H3=-0.01, RCVD_IN_MSPIKE_WL=-0.01] + autolearn=disabled +Received: from arlo.cworth.org ([127.0.0.1]) + by localhost (arlo.cworth.org [127.0.0.1]) (amavisd-new, port 10024) + with ESMTP id oadNhCM86-GP for ; + Fri, 4 Sep 2015 11:49:21 -0700 (PDT) +Received: from mail-wi0-f169.google.com (mail-wi0-f169.google.com + [209.85.212.169]) + by arlo.cworth.org (Postfix) with ESMTPS id 2698E6DE1472 + for ; Fri, 4 Sep 2015 11:49:21 -0700 (PDT) +Received: by wicge5 with SMTP id ge5so26321556wic.0 + for ; Fri, 04 Sep 2015 11:49:19 -0700 (PDT) +X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; + d=1e100.net; s=20130820; + h=x-gm-message-state:from:to:cc:subject:date:message-id; + bh=EJrIS+RlC8R1aZRdV96IhDZjsS8aBaYHdtNfC3m9h2E=; + b=avn7uOG4IJdtphiSuq4vUCvQxWQie2A2ulPG0i6b1W6FfMhu0EGfwPQzMLQY0UjCQU + YnxvpF7xttdChuNCUNkWVzuvPI4YLy4ZElDf6X7Uyo5JknD3C4HuHojRVcQwPLPnTZ9Q + a/XE053YIxgkOoSegLKiYz+m34ANOJCwEcgmG3xIj72ZqBpzwV0vDzJF5GkI5JQDC1Ab + rvP4dj88nzjPNrZp45wQ4OUOk/8AmPRhxa0WDzFA6hyUT5iMI+4ULsobwzaICPhmlYYN + VSOZ6AtWxVAMkeXj8UW+zWheeGy6+bFWW6R7zi1EhfHfKVyBQjtMijHt8UVPn6LdmetT + 9YHQ== +X-Gm-Message-State: + ALoCoQmy/g9/IYu4fowlhv39qwBe4JYoKHYloBeV9Fjee6jmD1kj6WLMGY3CKrTrM28swKClNqmT +X-Received: by 10.194.21.98 with SMTP id u2mr10167602wje.141.1441392559750; + Fri, 04 Sep 2015 11:49:19 -0700 (PDT) +Received: from localhost (mobile-access-bcee4f-131.dhcp.inet.fi. + [188.238.79.131]) + by smtp.gmail.com with ESMTPSA id u8sm5672719wia.19.2015.09.04.11.49.18 + (version=TLSv1/SSLv3 cipher=OTHER); + Fri, 04 Sep 2015 11:49:19 -0700 (PDT) +From: Jani Nikula +To: notmuch@notmuchmail.org +Subject: [PATCH 1/2] test: fix whitespace/indentation in symbol-test +Date: Fri, 4 Sep 2015 21:49:14 +0300 +Message-Id: <1441392555-20056-1-git-send-email-jani@nikula.org> +X-Mailer: git-send-email 2.1.4 +X-BeenThere: notmuch@notmuchmail.org +X-Mailman-Version: 2.1.18 +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: Fri, 04 Sep 2015 18:49:23 -0000 + +Not of much consequence, but makes it nicer to do further edits. +--- + test/symbol-test.cc | 34 ++++++++++++++++++---------------- + 1 file changed, 18 insertions(+), 16 deletions(-) + +diff --git a/test/symbol-test.cc b/test/symbol-test.cc +index fb77b418a1a8..77dbc1af44b2 100644 +--- a/test/symbol-test.cc ++++ b/test/symbol-test.cc +@@ -3,23 +3,25 @@ + #include + #include + ++int main (int argc, char** argv) ++{ ++ notmuch_database_t *notmuch; ++ char *message = NULL; + +-int main(int argc, char** argv) { +- notmuch_database_t *notmuch; +- char *message = NULL; ++ if (notmuch_database_open_verbose (argv[1], NOTMUCH_DATABASE_MODE_READ_ONLY, ++ ¬much, &message)) { ++ if (message) { ++ fputs (message, stderr); ++ free (message); ++ } ++ } + +- if (notmuch_database_open_verbose (argv[1], NOTMUCH_DATABASE_MODE_READ_ONLY, ¬much, &message)) +- if (message) { +- fputs (message, stderr); +- free (message); +- } ++ try { ++ (void) new Xapian::WritableDatabase (argv[2], Xapian::DB_OPEN); ++ } catch (const Xapian::Error &error) { ++ printf("caught %s\n", error.get_msg().c_str()); ++ return 0; ++ } + +- try { +- (void) new Xapian::WritableDatabase(argv[2], Xapian::DB_OPEN); +- } catch (const Xapian::Error &error) { +- printf("caught %s\n", error.get_msg().c_str()); +- return 0; +- } +- +- return 1; ++ return 1; + } +-- +2.1.4 + -- 2.26.2