[PATCH v3 3/9] lib: Introduce macros for bit operations

diff --git a/47/5202e7fddcae3d0ba837799b0504feae88b08b b/47/5202e7fddcae3d0ba837799b0504feae88b08b
new file mode 100644 (file)
index 0000000..15b8176
--- /dev/null
+++ b/47/5202e7fddcae3d0ba837799b0504feae88b08b
@@ -0,0 +1,134 @@
+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 1D254429E2F\r
+       for <notmuch@notmuchmail.org>; Thu, 23 Oct 2014 05:31:01 -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 Pjfgh+gUkqfu for <notmuch@notmuchmail.org>;\r
+       Thu, 23 Oct 2014 05:30:52 -0700 (PDT)\r
+Received: from dmz-mailsec-scanner-8.mit.edu (dmz-mailsec-scanner-8.mit.edu\r
+       [18.7.68.37])\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 46CBA431FD7\r
+       for <notmuch@notmuchmail.org>; Thu, 23 Oct 2014 05:30:52 -0700 (PDT)\r
+X-AuditID: 12074425-f79e46d000002583-90-5448f4fbe9df\r
+Received: from mailhub-auth-1.mit.edu ( [18.9.21.35])\r
+       (using TLS with cipher AES256-SHA (256/256 bits))\r
+       (Client did not present a certificate)\r
+       by dmz-mailsec-scanner-8.mit.edu (Symantec Messaging Gateway) with SMTP\r
+       id 0C.F4.09603.BF4F8445; Thu, 23 Oct 2014 08:30:51 -0400 (EDT)\r
+Received: from outgoing.mit.edu (outgoing-auth-1.mit.edu [18.9.28.11])\r
+       by mailhub-auth-1.mit.edu (8.13.8/8.9.2) with ESMTP id s9NCUmxd030363; \r
+       Thu, 23 Oct 2014 08:30:48 -0400\r
+Received: from drake.dyndns.org\r
+       (216-15-114-40.c3-0.arl-ubr1.sbo-arl.ma.cable.rcn.com\r
+       [216.15.114.40]) (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 s9NCUhFr008930\r
+       (version=TLSv1/SSLv3 cipher=AES128-SHA bits=128 verify=NOT);\r
+       Thu, 23 Oct 2014 08:30:46 -0400\r
+Received: from amthrax by drake.dyndns.org with local (Exim 4.84)\r
+       (envelope-from <aclements@csail.mit.edu>)\r
+       id 1XhHXP-0007bk-8D; Thu, 23 Oct 2014 08:30:43 -0400\r
+From: Austin Clements <aclements@csail.mit.edu>\r
+To: notmuch@notmuchmail.org\r
+Subject: [PATCH v3 3/9] lib: Introduce macros for bit operations\r
+Date: Thu, 23 Oct 2014 08:30:35 -0400\r
+Message-Id: <1414067441-29054-4-git-send-email-aclements@csail.mit.edu>\r
+X-Mailer: git-send-email 2.1.0\r
+In-Reply-To: <1414067441-29054-1-git-send-email-aclements@csail.mit.edu>\r
+References: <1414067441-29054-1-git-send-email-aclements@csail.mit.edu>\r
+X-Brightmail-Tracker:\r
+ H4sIAAAAAAAAA+NgFtrNIsWRmVeSWpSXmKPExsUixCmqrPv7i0eIweffyhar5/JYXL85k9mB\r
+       yWPnrLvsHs9W3WIOYIrisklJzcksSy3St0vgyni56CVrwS6+ip7dF9gaGA9ydzFyckgImEis\r
+       uNzOBGGLSVy4t54NxBYSmM0ksWRvZRcjF5C9kVHiclcvE4Rzh0ni7tvDzBBVSxglHt8MA7HZ\r
+       BPQlVqydxApiiwhIS+y8OxvMZhbwkJjS+grMFhZwkJjd/okRxGYRUJWYO3kK2GZeAXeJzuNr\r
+       oa6Qk9iw+z9YDSdQ754dd6AucpfY/vwg6wRG/gWMDKsYZVNyq3RzEzNzilOTdYuTE/PyUot0\r
+       LfRyM0v0UlNKNzGCwojdRXUH44RDSocYBTgYlXh4L6R6hAixJpYVV+YeYpTkYFIS5Y15ABTi\r
+       S8pPqcxILM6ILyrNSS0+xCjBwawkwht/ASjHm5JYWZValA+TkuZgURLn3fSDL0RIID2xJDU7\r
+       NbUgtQgmK8PBoSTBywiMFyHBotT01Iq0zJwShDQTByfIcB6g4bc+gwwvLkjMLc5Mh8ifYlSU\r
+       EudNBkkIgCQySvPgemFx/opRHOgVYV41kBU8wBQB1/0KaDATyNUbwAaXJCKkpBoY1Zh2nWh6\r
+       NFmGRSzRakl6ySVuzz2mq5mOruz+IGUf4uHk6vL6xYbsIJslNs8PO934JHTWxHTd60cWK3Ja\r
+       s6/Glc7TC+v9/o7z1qzrSrfMXKd5axzkkbcta5l8TizZNejGr6hYlXv/f5/fafJ6aVy/yp26\r
+       fNVPeTF6Mk73GJT2OB5vWxdwLfWbEktxRqKhFnNRcSIAeYE5RM4CAAA=\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: Thu, 23 Oct 2014 12:31:01 -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