1 Return-Path: <aclements@csail.mit.edu>
\r
2 X-Original-To: notmuch@notmuchmail.org
\r
3 Delivered-To: notmuch@notmuchmail.org
\r
4 Received: from localhost (localhost [127.0.0.1])
\r
5 by olra.theworths.org (Postfix) with ESMTP id 2C4C8431FC9
\r
6 for <notmuch@notmuchmail.org>; Fri, 24 Oct 2014 05:49:33 -0700 (PDT)
\r
7 X-Virus-Scanned: Debian amavisd-new at olra.theworths.org
\r
11 X-Spam-Status: No, score=-2.3 tagged_above=-999 required=5
\r
12 tests=[RCVD_IN_DNSWL_MED=-2.3] autolearn=disabled
\r
13 Received: from olra.theworths.org ([127.0.0.1])
\r
14 by localhost (olra.theworths.org [127.0.0.1]) (amavisd-new, port 10024)
\r
15 with ESMTP id T+4I7UWAPhti for <notmuch@notmuchmail.org>;
\r
16 Fri, 24 Oct 2014 05:49:24 -0700 (PDT)
\r
17 Received: from dmz-mailsec-scanner-4.mit.edu (dmz-mailsec-scanner-4.mit.edu
\r
19 (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits))
\r
20 (No client certificate requested)
\r
21 by olra.theworths.org (Postfix) with ESMTPS id 20ACB431FBD
\r
22 for <notmuch@notmuchmail.org>; Fri, 24 Oct 2014 05:49:24 -0700 (PDT)
\r
23 X-AuditID: 1209190f-f79aa6d000005b45-f3-544a4ad32ed3
\r
24 Received: from mailhub-auth-2.mit.edu ( [18.7.62.36])
\r
25 (using TLS with cipher AES256-SHA (256/256 bits))
\r
26 (Client did not present a certificate)
\r
27 by dmz-mailsec-scanner-4.mit.edu (Symantec Messaging Gateway) with SMTP
\r
28 id 45.7B.23365.3DA4A445; Fri, 24 Oct 2014 08:49:23 -0400 (EDT)
\r
29 Received: from outgoing.mit.edu (outgoing-auth-1.mit.edu [18.9.28.11])
\r
30 by mailhub-auth-2.mit.edu (8.13.8/8.9.2) with ESMTP id s9OCnLsC013437;
\r
31 Fri, 24 Oct 2014 08:49:21 -0400
\r
32 Received: from drake.dyndns.org
\r
33 (216-15-114-40.c3-0.arl-ubr1.sbo-arl.ma.cable.rcn.com
\r
34 [216.15.114.40]) (authenticated bits=0)
\r
35 (User authenticated as amdragon@ATHENA.MIT.EDU)
\r
36 by outgoing.mit.edu (8.13.8/8.12.4) with ESMTP id s9OCnIF4021584
\r
37 (version=TLSv1/SSLv3 cipher=AES128-SHA bits=128 verify=NOT);
\r
38 Fri, 24 Oct 2014 08:49:20 -0400
\r
39 Received: from amthrax by drake.dyndns.org with local (Exim 4.84)
\r
40 (envelope-from <aclements@csail.mit.edu>)
\r
41 id 1XheIx-0004k2-64; Fri, 24 Oct 2014 08:49:19 -0400
\r
42 From: Austin Clements <aclements@csail.mit.edu>
\r
43 To: notmuch@notmuchmail.org
\r
44 Subject: [PATCH v3.1 3/9] lib: Introduce macros for bit operations
\r
45 Date: Fri, 24 Oct 2014 08:49:15 -0400
\r
46 Message-Id: <1414154955-18114-1-git-send-email-aclements@csail.mit.edu>
\r
47 X-Mailer: git-send-email 2.1.0
\r
49 <CAB+hUn_d3Wp2bie3E6n1gtb9J_NypAv5rHmr3ObAqWsOX-hzFw@mail.gmail.com>
\r
51 <CAB+hUn_d3Wp2bie3E6n1gtb9J_NypAv5rHmr3ObAqWsOX-hzFw@mail.gmail.com>
\r
52 X-Brightmail-Tracker:
\r
53 H4sIAAAAAAAAA+NgFtrDIsWRmVeSWpSXmKPExsUixG6nonvZyyvE4Ot1OYum6c4W12/OZHZg
\r
54 8rh1/zW7x7NVt5gDmKK4bFJSczLLUov07RK4MiatnsBacIavovvKdOYGxsvcXYycHBICJhLv
\r
55 N21hgbDFJC7cW8/WxcjFISQwm0li67rjUM5GRon5Ry4zQTh3mCQub7jDDuEsYZToWfkOrJ9N
\r
56 QF9ixdpJrCC2iIC0xM67s4FsDg5mATuJ3Y0BIGFhASeJK8/XMoHYLAKqEhfu72MDsXkF3CXO
\r
57 znrICnGGnMSG3f8ZQWxOgUCJb8vvgdUICQRIXPp3gXkCI/8CRoZVjLIpuVW6uYmZOcWpybrF
\r
58 yYl5ealFuiZ6uZkleqkppZsYQYHEKcm/g/HbQaVDjAIcjEo8vDdmeIYIsSaWFVfmHmKU5GBS
\r
59 EuVl8fQKEeJLyk+pzEgszogvKs1JLT7EKMHBrCTC62UClONNSaysSi3Kh0lJc7AoifNu+sEX
\r
60 IiSQnliSmp2aWpBaBJOV4eBQkuDNARkqWJSanlqRlplTgpBm4uAEGc4DNHwTSA1vcUFibnFm
\r
61 OkT+FKOilDjvCw+ghABIIqM0D64XFumvGMWBXhHmtQVp5wEmCbjuV0CDmYAGx2/wABlckoiQ
\r
62 kmpgXJh19PBKw00PhDr2n9wqvDPBv/hWo3JUQeeCFM/eQzXMWVNDtt8T+d+8VezCgbRwBa26
\r
63 IzU3Zla61r5rbdtWdY3LVv53mKXj+upsZ3UJ+SeH92zh74nLdkx1by1jmO1uwD3H0/yc1eX6
\r
64 7OrGDZP8F5t9WP+gI6Lx+hGmGY9kl/LLC2sXM8gosRRnJBpqMRcVJwIA1dA9i88CAAA=
\r
65 Cc: Austin Clements <aclements@csail.mit.edu>
\r
66 X-BeenThere: notmuch@notmuchmail.org
\r
67 X-Mailman-Version: 2.1.13
\r
69 List-Id: "Use and development of the notmuch mail system."
\r
70 <notmuch.notmuchmail.org>
\r
71 List-Unsubscribe: <http://notmuchmail.org/mailman/options/notmuch>,
\r
72 <mailto:notmuch-request@notmuchmail.org?subject=unsubscribe>
\r
73 List-Archive: <http://notmuchmail.org/pipermail/notmuch>
\r
74 List-Post: <mailto:notmuch@notmuchmail.org>
\r
75 List-Help: <mailto:notmuch-request@notmuchmail.org?subject=help>
\r
76 List-Subscribe: <http://notmuchmail.org/mailman/listinfo/notmuch>,
\r
77 <mailto:notmuch-request@notmuchmail.org?subject=subscribe>
\r
78 X-List-Received-Date: Fri, 24 Oct 2014 12:49:33 -0000
\r
80 These macros help clarify basic bit-twiddling code and are written to
\r
81 be robust against C undefined behavior of shift operators.
\r
83 lib/message.cc | 6 +++---
\r
84 lib/notmuch-private.h | 11 +++++++++++
\r
85 2 files changed, 14 insertions(+), 3 deletions(-)
\r
87 diff --git a/lib/message.cc b/lib/message.cc
\r
88 index 38bc929..55d2ff6 100644
\r
89 --- a/lib/message.cc
\r
90 +++ b/lib/message.cc
\r
91 @@ -869,7 +869,7 @@ notmuch_bool_t
\r
92 notmuch_message_get_flag (notmuch_message_t *message,
\r
93 notmuch_message_flag_t flag)
\r
95 - return message->flags & (1 << flag);
\r
96 + return NOTMUCH_TEST_BIT (message->flags, flag);
\r
100 @@ -877,9 +877,9 @@ notmuch_message_set_flag (notmuch_message_t *message,
\r
101 notmuch_message_flag_t flag, notmuch_bool_t enable)
\r
104 - message->flags |= (1 << flag);
\r
105 + NOTMUCH_SET_BIT (&message->flags, flag);
\r
107 - message->flags &= ~(1 << flag);
\r
108 + NOTMUCH_CLEAR_BIT (&message->flags, flag);
\r
112 diff --git a/lib/notmuch-private.h b/lib/notmuch-private.h
\r
113 index 36cc12b..b86897c 100644
\r
114 --- a/lib/notmuch-private.h
\r
115 +++ b/lib/notmuch-private.h
\r
116 @@ -63,6 +63,17 @@ NOTMUCH_BEGIN_DECLS
\r
117 #define STRNCMP_LITERAL(var, literal) \
\r
118 strncmp ((var), (literal), sizeof (literal) - 1)
\r
120 +/* Robust bit test/set/reset macros */
\r
121 +#define NOTMUCH_TEST_BIT(val, bit) \
\r
122 + (((bit) < 0 || (bit) >= CHAR_BIT * sizeof (unsigned long long)) ? 0 \
\r
123 + : !!((val) & (1ull << (bit))))
\r
124 +#define NOTMUCH_SET_BIT(valp, bit) \
\r
125 + (((bit) < 0 || (bit) >= CHAR_BIT * sizeof (unsigned long long)) ? *(valp) \
\r
126 + : (*(valp) |= (1ull << (bit))))
\r
127 +#define NOTMUCH_CLEAR_BIT(valp, bit) \
\r
128 + (((bit) < 0 || (bit) >= CHAR_BIT * sizeof (unsigned long long)) ? *(valp) \
\r
129 + : (*(valp) &= ~(1ull << (bit))))
\r
131 #define unused(x) x __attribute__ ((unused))
\r