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 D5864431FB6
\r
6 for <notmuch@notmuchmail.org>; Mon, 6 Oct 2014 16:17:34 -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 uLINbIqK3ONC for <notmuch@notmuchmail.org>;
\r
16 Mon, 6 Oct 2014 16:17:31 -0700 (PDT)
\r
17 Received: from dmz-mailsec-scanner-1.mit.edu (dmz-mailsec-scanner-1.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 F2914431FBC
\r
22 for <notmuch@notmuchmail.org>; Mon, 6 Oct 2014 16:17:26 -0700 (PDT)
\r
23 X-AuditID: 1209190c-f795e6d000006c66-10-543323062dd6
\r
24 Received: from mailhub-auth-4.mit.edu ( [18.7.62.39])
\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-1.mit.edu (Symantec Messaging Gateway) with SMTP
\r
28 id 67.75.27750.60323345; Mon, 6 Oct 2014 19:17:26 -0400 (EDT)
\r
29 Received: from outgoing.mit.edu (outgoing-auth-1.mit.edu [18.9.28.11])
\r
30 by mailhub-auth-4.mit.edu (8.13.8/8.9.2) with ESMTP id s96NHPeo032089;
\r
31 Mon, 6 Oct 2014 19:17:25 -0400
\r
32 Received: from drake.dyndns.org ([12.185.136.2]) (authenticated bits=0)
\r
33 (User authenticated as amdragon@ATHENA.MIT.EDU)
\r
34 by outgoing.mit.edu (8.13.8/8.12.4) with ESMTP id s96NHMKE014465
\r
35 (version=TLSv1/SSLv3 cipher=AES128-SHA bits=128 verify=NOT);
\r
36 Mon, 6 Oct 2014 19:17:24 -0400
\r
37 Received: from amthrax by drake.dyndns.org with local (Exim 4.84)
\r
38 (envelope-from <aclements@csail.mit.edu>)
\r
39 id 1XbHWs-0001Jd-09; Mon, 06 Oct 2014 17:17:22 -0600
\r
40 From: Austin Clements <aclements@csail.mit.edu>
\r
41 To: notmuch@notmuchmail.org
\r
42 Subject: [PATCH v2 06/12] lib: Introduce macros for bit operations
\r
43 Date: Mon, 6 Oct 2014 17:17:12 -0600
\r
44 Message-Id: <1412637438-4821-7-git-send-email-aclements@csail.mit.edu>
\r
45 X-Mailer: git-send-email 2.1.0
\r
46 In-Reply-To: <1412637438-4821-1-git-send-email-aclements@csail.mit.edu>
\r
47 References: <1412637438-4821-1-git-send-email-aclements@csail.mit.edu>
\r
48 X-Brightmail-Tracker:
\r
49 H4sIAAAAAAAAA+NgFtrLIsWRmVeSWpSXmKPExsUixG6nrsumbBxisH0Vr8WN1m5Gi+s3ZzI7
\r
50 MHk8W3WL2WPLoffMAUxRXDYpqTmZZalF+nYJXBkvF71kLdjFV9Gz+wJbA+NB7i5GTg4JAROJ
\r
51 3R9OM0LYYhIX7q1nA7GFBGYzSTxpcOpi5AKyNzBKrNixnQXCWcok8WvlDnYIZwmjRHvrEWaQ
\r
52 FjYBfYkVayexgtgiAtISO+/OBrOZBRwk3k56CrZCWMBJ4t2xGSwgNouAqsTGZX1gcV4BN4kP
\r
53 LTfYIM6Qk9iw+z9YnFPAXWLNlcmsECe5STz/+ZRlAiP/AkaGVYyyKblVurmJmTnFqcm6xcmJ
\r
54 eXmpRbqGermZJXqpKaWbGEGhxCnJs4PxzUGlQ4wCHIxKPLwROwxDhFgTy4orcw8xSnIwKYny
\r
55 zmE3DhHiS8pPqcxILM6ILyrNSS0+xCjBwawkwsv12yhEiDclsbIqtSgfJiXNwaIkzrvpB1+I
\r
56 kEB6YklqdmpqQWoRTFaGg0NJgveQItBQwaLU9NSKtMycEoQ0EwcnyHAeoOFgNbzFBYm5xZnp
\r
57 EPlTjIpS4rzBIAkBkERGaR5cLyzWXzGKA70izHsTpIoHmCbgul8BDWYCGmw6Rx9kcEkiQkqq
\r
58 gXFOgcSOpFcK4XPuZBtX3C73jsjQ6Nfc1KNqMWm9rI2h1JwdgR0+iq5Z0/dO6axwyRCfLZ/t
\r
59 p93FVMJ7WcVv42XZ4vM8a/+y8km/9vv5LV7X5vKOkpf+E82vv5mXmLDv0gnusw6/hSOy2BRf
\r
60 bJtQLBC8Qqfqzd4T8x4tE7E+c3+3nOPet/PEdJVYijMSDbWYi4oTAU+HIQfQAgAA
\r
61 Cc: Austin Clements <aclements@csail.mit.edu>
\r
62 X-BeenThere: notmuch@notmuchmail.org
\r
63 X-Mailman-Version: 2.1.13
\r
65 List-Id: "Use and development of the notmuch mail system."
\r
66 <notmuch.notmuchmail.org>
\r
67 List-Unsubscribe: <http://notmuchmail.org/mailman/options/notmuch>,
\r
68 <mailto:notmuch-request@notmuchmail.org?subject=unsubscribe>
\r
69 List-Archive: <http://notmuchmail.org/pipermail/notmuch>
\r
70 List-Post: <mailto:notmuch@notmuchmail.org>
\r
71 List-Help: <mailto:notmuch-request@notmuchmail.org?subject=help>
\r
72 List-Subscribe: <http://notmuchmail.org/mailman/listinfo/notmuch>,
\r
73 <mailto:notmuch-request@notmuchmail.org?subject=subscribe>
\r
74 X-List-Received-Date: Mon, 06 Oct 2014 23:17:35 -0000
\r
76 These macros help clarify basic bit-twiddling code and are written to
\r
77 be robust against C undefined behavior of shift operators.
\r
79 lib/message.cc | 6 +++---
\r
80 lib/notmuch-private.h | 11 +++++++++++
\r
81 2 files changed, 14 insertions(+), 3 deletions(-)
\r
83 diff --git a/lib/message.cc b/lib/message.cc
\r
84 index 38bc929..55d2ff6 100644
\r
85 --- a/lib/message.cc
\r
86 +++ b/lib/message.cc
\r
87 @@ -869,7 +869,7 @@ notmuch_bool_t
\r
88 notmuch_message_get_flag (notmuch_message_t *message,
\r
89 notmuch_message_flag_t flag)
\r
91 - return message->flags & (1 << flag);
\r
92 + return NOTMUCH_TEST_BIT (message->flags, flag);
\r
96 @@ -877,9 +877,9 @@ notmuch_message_set_flag (notmuch_message_t *message,
\r
97 notmuch_message_flag_t flag, notmuch_bool_t enable)
\r
100 - message->flags |= (1 << flag);
\r
101 + NOTMUCH_SET_BIT (&message->flags, flag);
\r
103 - message->flags &= ~(1 << flag);
\r
104 + NOTMUCH_CLEAR_BIT (&message->flags, flag);
\r
108 diff --git a/lib/notmuch-private.h b/lib/notmuch-private.h
\r
109 index 36cc12b..7250291 100644
\r
110 --- a/lib/notmuch-private.h
\r
111 +++ b/lib/notmuch-private.h
\r
112 @@ -63,6 +63,17 @@ NOTMUCH_BEGIN_DECLS
\r
113 #define STRNCMP_LITERAL(var, literal) \
\r
114 strncmp ((var), (literal), sizeof (literal) - 1)
\r
116 +/* Robust bit test/set/reset macros */
\r
117 +#define NOTMUCH_TEST_BIT(val, bit) \
\r
118 + ((bit < 0 || bit >= CHAR_BIT * sizeof (unsigned long long)) ? 0 \
\r
119 + : !!((val) & (1ull << bit)))
\r
120 +#define NOTMUCH_SET_BIT(valp, bit) \
\r
121 + ((bit < 0 || bit >= CHAR_BIT * sizeof (unsigned long long)) ? *(valp) \
\r
122 + : (*(valp) |= (1ull << bit)))
\r
123 +#define NOTMUCH_CLEAR_BIT(valp, bit) \
\r
124 + ((bit < 0 || bit >= CHAR_BIT * sizeof (unsigned long long)) ? *(valp) \
\r
125 + : (*(valp) &= ~(1ull << bit)))
\r
127 #define unused(x) x __attribute__ ((unused))
\r