[PATCH v2 06/12] lib: Introduce macros for bit operations

diff --git a/71/dafec945df81b67890f8c0a501c5bbed48ebbd b/71/dafec945df81b67890f8c0a501c5bbed48ebbd
new file mode 100644 (file)
index 0000000..7e59060
--- /dev/null
+++ b/71/dafec945df81b67890f8c0a501c5bbed48ebbd
@@ -0,0 +1,132 @@
+Return-Path: <aclements@csail.mit.edu>\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 D5864431FB6\r
+       for <notmuch@notmuchmail.org>; Mon,  6 Oct 2014 16:17:34 -0700 (PDT)\r
+X-Virus-Scanned: Debian amavisd-new at olra.theworths.org\r
+X-Spam-Flag: NO\r
+X-Spam-Score: -2.3\r
+X-Spam-Level: \r
+X-Spam-Status: No, score=-2.3 tagged_above=-999 required=5\r
+       tests=[RCVD_IN_DNSWL_MED=-2.3] 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 uLINbIqK3ONC for <notmuch@notmuchmail.org>;\r
+       Mon,  6 Oct 2014 16:17:31 -0700 (PDT)\r
+Received: from dmz-mailsec-scanner-1.mit.edu (dmz-mailsec-scanner-1.mit.edu\r
+       [18.9.25.12])\r
+       (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits))\r
+       (No client certificate requested)\r
+       by olra.theworths.org (Postfix) with ESMTPS id F2914431FBC\r
+       for <notmuch@notmuchmail.org>; Mon,  6 Oct 2014 16:17:26 -0700 (PDT)\r
+X-AuditID: 1209190c-f795e6d000006c66-10-543323062dd6\r
+Received: from mailhub-auth-4.mit.edu ( [18.7.62.39])\r
+       (using TLS with cipher AES256-SHA (256/256 bits))\r
+       (Client did not present a certificate)\r
+       by dmz-mailsec-scanner-1.mit.edu (Symantec Messaging Gateway) with SMTP\r
+       id 67.75.27750.60323345; Mon,  6 Oct 2014 19:17:26 -0400 (EDT)\r
+Received: from outgoing.mit.edu (outgoing-auth-1.mit.edu [18.9.28.11])\r
+       by mailhub-auth-4.mit.edu (8.13.8/8.9.2) with ESMTP id s96NHPeo032089; \r
+       Mon, 6 Oct 2014 19:17:25 -0400\r
+Received: from drake.dyndns.org ([12.185.136.2]) (authenticated bits=0)\r
+       (User authenticated as amdragon@ATHENA.MIT.EDU)\r
+       by outgoing.mit.edu (8.13.8/8.12.4) with ESMTP id s96NHMKE014465\r
+       (version=TLSv1/SSLv3 cipher=AES128-SHA bits=128 verify=NOT);\r
+       Mon, 6 Oct 2014 19:17:24 -0400\r
+Received: from amthrax by drake.dyndns.org with local (Exim 4.84)\r
+       (envelope-from <aclements@csail.mit.edu>)\r
+       id 1XbHWs-0001Jd-09; Mon, 06 Oct 2014 17:17:22 -0600\r
+From: Austin Clements <aclements@csail.mit.edu>\r
+To: notmuch@notmuchmail.org\r
+Subject: [PATCH v2 06/12] lib: Introduce macros for bit operations\r
+Date: Mon,  6 Oct 2014 17:17:12 -0600\r
+Message-Id: <1412637438-4821-7-git-send-email-aclements@csail.mit.edu>\r
+X-Mailer: git-send-email 2.1.0\r
+In-Reply-To: <1412637438-4821-1-git-send-email-aclements@csail.mit.edu>\r
+References: <1412637438-4821-1-git-send-email-aclements@csail.mit.edu>\r
+X-Brightmail-Tracker:\r
+ H4sIAAAAAAAAA+NgFtrLIsWRmVeSWpSXmKPExsUixG6nrsumbBxisH0Vr8WN1m5Gi+s3ZzI7\r
+       MHk8W3WL2WPLoffMAUxRXDYpqTmZZalF+nYJXBkvF71kLdjFV9Gz+wJbA+NB7i5GTg4JAROJ\r
+       3R9OM0LYYhIX7q1nA7GFBGYzSTxpcOpi5AKyNzBKrNixnQXCWcok8WvlDnYIZwmjRHvrEWaQ\r
+       FjYBfYkVayexgtgiAtISO+/OBrOZBRwk3k56CrZCWMBJ4t2xGSwgNouAqsTGZX1gcV4BN4kP\r
+       LTfYIM6Qk9iw+z9YnFPAXWLNlcmsECe5STz/+ZRlAiP/AkaGVYyyKblVurmJmTnFqcm6xcmJ\r
+       eXmpRbqGermZJXqpKaWbGEGhxCnJs4PxzUGlQ4wCHIxKPLwROwxDhFgTy4orcw8xSnIwKYny\r
+       zmE3DhHiS8pPqcxILM6ILyrNSS0+xCjBwawkwsv12yhEiDclsbIqtSgfJiXNwaIkzrvpB1+I\r
+       kEB6YklqdmpqQWoRTFaGg0NJgveQItBQwaLU9NSKtMycEoQ0EwcnyHAeoOFgNbzFBYm5xZnp\r
+       EPlTjIpS4rzBIAkBkERGaR5cLyzWXzGKA70izHsTpIoHmCbgul8BDWYCGmw6Rx9kcEkiQkqq\r
+       gXFOgcSOpFcK4XPuZBtX3C73jsjQ6Nfc1KNqMWm9rI2h1JwdgR0+iq5Z0/dO6axwyRCfLZ/t\r
+       p93FVMJ7WcVv42XZ4vM8a/+y8km/9vv5LV7X5vKOkpf+E82vv5mXmLDv0gnusw6/hSOy2BRf\r
+       bJtQLBC8Qqfqzd4T8x4tE7E+c3+3nOPet/PEdJVYijMSDbWYi4oTAU+HIQfQAgAA\r
+Cc: Austin Clements <aclements@csail.mit.edu>\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, 06 Oct 2014 23:17:35 -0000\r
+\r
+These macros help clarify basic bit-twiddling code and are written to\r
+be robust against C undefined behavior of shift operators.\r
+---\r
+ lib/message.cc        |  6 +++---\r
+ lib/notmuch-private.h | 11 +++++++++++\r
+ 2 files changed, 14 insertions(+), 3 deletions(-)\r
+\r
+diff --git a/lib/message.cc b/lib/message.cc\r
+index 38bc929..55d2ff6 100644\r
+--- a/lib/message.cc\r
++++ b/lib/message.cc\r
+@@ -869,7 +869,7 @@ notmuch_bool_t\r
+ notmuch_message_get_flag (notmuch_message_t *message,\r
+                         notmuch_message_flag_t flag)\r
+ {\r
+-    return message->flags & (1 << flag);\r
++    return NOTMUCH_TEST_BIT (message->flags, flag);\r
+ }\r
+ \r
+ void\r
+@@ -877,9 +877,9 @@ notmuch_message_set_flag (notmuch_message_t *message,\r
+                         notmuch_message_flag_t flag, notmuch_bool_t enable)\r
+ {\r
+     if (enable)\r
+-      message->flags |= (1 << flag);\r
++      NOTMUCH_SET_BIT (&message->flags, flag);\r
+     else\r
+-      message->flags &= ~(1 << flag);\r
++      NOTMUCH_CLEAR_BIT (&message->flags, flag);\r
+ }\r
+ \r
+ time_t\r
+diff --git a/lib/notmuch-private.h b/lib/notmuch-private.h\r
+index 36cc12b..7250291 100644\r
+--- a/lib/notmuch-private.h\r
++++ b/lib/notmuch-private.h\r
+@@ -63,6 +63,17 @@ NOTMUCH_BEGIN_DECLS\r
+ #define STRNCMP_LITERAL(var, literal) \\r
+     strncmp ((var), (literal), sizeof (literal) - 1)\r
+ \r
++/* Robust bit test/set/reset macros */\r
++#define NOTMUCH_TEST_BIT(val, bit) \\r
++    ((bit < 0 || bit >= CHAR_BIT * sizeof (unsigned long long)) ? 0   \\r
++     : !!((val) & (1ull << bit)))\r
++#define NOTMUCH_SET_BIT(valp, bit) \\r
++    ((bit < 0 || bit >= CHAR_BIT * sizeof (unsigned long long)) ? *(valp) \\r
++     : (*(valp) |= (1ull << bit)))\r
++#define NOTMUCH_CLEAR_BIT(valp,  bit) \\r
++    ((bit < 0 || bit >= CHAR_BIT * sizeof (unsigned long long)) ? *(valp) \\r
++     : (*(valp) &= ~(1ull << bit)))\r
++\r
+ #define unused(x) x __attribute__ ((unused))\r
+ \r
+ #ifdef __cplusplus\r
+-- \r
+2.1.0\r
+\r