[PATCH 2/3] lib: fix clang build warnings

diff --git a/73/607e540b8034296518374bf4fd1dfff02fb1b4 b/73/607e540b8034296518374bf4fd1dfff02fb1b4
new file mode 100644 (file)
index 0000000..46d615c
--- /dev/null
+++ b/73/607e540b8034296518374bf4fd1dfff02fb1b4
@@ -0,0 +1,97 @@
+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 olra.theworths.org (Postfix) with ESMTP id 9CABB431FDA\r
+       for <notmuch@notmuchmail.org>; Mon, 23 Feb 2015 09:04:24 -0800 (PST)\r
+X-Virus-Scanned: Debian amavisd-new at olra.theworths.org\r
+X-Spam-Flag: NO\r
+X-Spam-Score: 1.738\r
+X-Spam-Level: *\r
+X-Spam-Status: No, score=1.738 tagged_above=-999 required=5\r
+       tests=[DNS_FROM_AHBL_RHSBL=2.438, RCVD_IN_DNSWL_LOW=-0.7]\r
+       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 i3emdSNfaFAr for <notmuch@notmuchmail.org>;\r
+       Mon, 23 Feb 2015 09:04:21 -0800 (PST)\r
+Received: from mail-wi0-f174.google.com (mail-wi0-f174.google.com\r
+       [209.85.212.174]) (using TLSv1 with cipher RC4-SHA (128/128 bits))\r
+       (No client certificate requested)\r
+       by olra.theworths.org (Postfix) with ESMTPS id 9F7AB431FDE\r
+       for <notmuch@notmuchmail.org>; Mon, 23 Feb 2015 09:04:19 -0800 (PST)\r
+Received: by mail-wi0-f174.google.com with SMTP id em10so19269948wid.1\r
+       for <notmuch@notmuchmail.org>; Mon, 23 Feb 2015 08:56:01 -0800 (PST)\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:in-reply-to\r
+       :references;\r
+       bh=NfoYblGsrwJTNyCeMXzCR5zR/76lWqpRX7JchQeQGdo=;\r
+       b=XI9ORpu0pyw2aGCRCy3zOJBrjCP4ZWfwRzWjd7QSXn4j3HM9C91syPmvI93ccE+LUo\r
+       Caq+6yDYxr8Wla0IJI+guYoiiNjOsPXfAxMq61jd5/OkrSOPebnJD6p3UmvxUJyvh9YE\r
+       s1vdYmGLdswupaL29MA+RCx1OcvEt3cquRs+OZcP3qVB1zzCKsIghS5LRGnwcJit4Vt3\r
+       E0taPbVSdOO/wuXn2rkLTnHst1ENUeZXIHolI66SOnvZfU751vlpGQHif3MLTKiQRrDS\r
+       2+KogB/7BOLOS6l4AmTsmMiLd8Rz0aLD7lI+UECKMrVvI7HC+RChAXCb/9YTzXmDI3G9\r
+       YgjA==\r
+X-Gm-Message-State:\r
+ ALoCoQms2NKDr08Uy0jDxSrUe/ruYedQZfU13lddSXjLUHj6yHuoHueGhhVc2Hhw7nW6WQjX4S8p\r
+X-Received: by 10.180.221.232 with SMTP id qh8mr17316382wic.19.1424710561739; \r
+       Mon, 23 Feb 2015 08:56:01 -0800 (PST)\r
+Received: from localhost (mobile-internet-bcee3b-76.dhcp.inet.fi.\r
+       [188.238.59.76]) by mx.google.com with ESMTPSA id\r
+       qo10sm56355792wjc.38.2015.02.23.08.56.00\r
+       (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128);\r
+       Mon, 23 Feb 2015 08:56:01 -0800 (PST)\r
+From: Jani Nikula <jani@nikula.org>\r
+To: notmuch@notmuchmail.org\r
+Subject: [PATCH 2/3] lib: fix clang build warnings\r
+Date: Mon, 23 Feb 2015 18:56:15 +0200\r
+Message-Id: <1424710576-30468-2-git-send-email-jani@nikula.org>\r
+X-Mailer: git-send-email 2.1.4\r
+In-Reply-To: <1424710576-30468-1-git-send-email-jani@nikula.org>\r
+References: <1424710576-30468-1-git-send-email-jani@nikula.org>\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: Mon, 23 Feb 2015 17:04:24 -0000\r
+\r
+Fix the following warning produced by clang 3.5.0:\r
+\r
+lib/message.cc:899:4: warning: comparison of constant 64 with expression of type 'notmuch_message_flag_t' (aka '_notmuch_message_flag') is always true [-Wtautological-constant-out-of-range-compare]\r
+        ! NOTMUCH_TEST_BIT (message->lazy_flags, flag))\r
+          ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~\r
+./lib/notmuch-private.h:70:6: note: expanded from macro 'NOTMUCH_TEST_BIT'\r
+    (_NOTMUCH_VALID_BIT(bit) ? !!((val) & (1ull << (bit))) : 0)\r
+     ^~~~~~~~~~~~~~~~~~~~~~~\r
+./lib/notmuch-private.h:68:26: note: expanded from macro '_NOTMUCH_VALID_BIT'\r
+    ((bit) >= 0 && (bit) < CHAR_BIT * sizeof (unsigned long long))\r
+                   ~~~~~ ^ ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~\r
+---\r
+ lib/notmuch-private.h | 2 +-\r
+ 1 file changed, 1 insertion(+), 1 deletion(-)\r
+\r
+diff --git a/lib/notmuch-private.h b/lib/notmuch-private.h\r
+index 02a8fc62b631..8a1f2fab77af 100644\r
+--- a/lib/notmuch-private.h\r
++++ b/lib/notmuch-private.h\r
+@@ -65,7 +65,7 @@ NOTMUCH_BEGIN_DECLS\r
+ \r
+ /* Robust bit test/set/reset macros */\r
+ #define _NOTMUCH_VALID_BIT(bit) \\r
+-    ((bit) >= 0 && (bit) < CHAR_BIT * sizeof (unsigned long long))\r
++    ((bit) >= 0 && ((unsigned long) bit) < CHAR_BIT * sizeof (unsigned long long))\r
+ #define NOTMUCH_TEST_BIT(val, bit) \\r
+     (_NOTMUCH_VALID_BIT(bit) ? !!((val) & (1ull << (bit))) : 0)\r
+ #define NOTMUCH_SET_BIT(valp, bit) \\r
+-- \r
+2.1.4\r
+\r