--- /dev/null
+Return-Path: <amdragon@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 B1246431FCF\r
+ for <notmuch@notmuchmail.org>; Thu, 31 Jul 2014 19:10:17 -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 z3-YlBSpDwZA for <notmuch@notmuchmail.org>;\r
+ Thu, 31 Jul 2014 19:10:11 -0700 (PDT)\r
+Received: from dmz-mailsec-scanner-5.mit.edu (dmz-mailsec-scanner-5.mit.edu\r
+ [18.7.68.34])\r
+ by olra.theworths.org (Postfix) with ESMTP id 688B9431FAE\r
+ for <notmuch@notmuchmail.org>; Thu, 31 Jul 2014 19:10:11 -0700 (PDT)\r
+X-AuditID: 12074422-f79be6d000007518-7e-53daf70279fb\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-5.mit.edu (Symantec Messaging Gateway) with SMTP\r
+ id CA.05.29976.207FAD35; Thu, 31 Jul 2014 22:10:10 -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 s712A92M014709; \r
+ Thu, 31 Jul 2014 22:10:09 -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 s712A6N4029973\r
+ (version=TLSv1/SSLv3 cipher=AES256-SHA bits=256 verify=NOT);\r
+ Thu, 31 Jul 2014 22:10:08 -0400\r
+Received: from amthrax by drake.dyndns.org with local (Exim 4.77)\r
+ (envelope-from <amdragon@mit.edu>)\r
+ id 1XD2IH-00033W-S4; Thu, 31 Jul 2014 22:10:05 -0400\r
+From: Austin Clements <amdragon@MIT.EDU>\r
+To: notmuch@notmuchmail.org\r
+Subject: [PATCH v3 02/13] util: Const version of strtok_len\r
+Date: Thu, 31 Jul 2014 22:09:52 -0400\r
+Message-Id: <1406859003-11561-3-git-send-email-amdragon@mit.edu>\r
+X-Mailer: git-send-email 2.0.0\r
+In-Reply-To: <1406859003-11561-1-git-send-email-amdragon@mit.edu>\r
+References: <1406859003-11561-1-git-send-email-amdragon@mit.edu>\r
+X-Brightmail-Tracker:\r
+ H4sIAAAAAAAAA+NgFtrNIsWRmVeSWpSXmKPExsUixCmqrMv0/VawwZfZPBar5/JYXL85k9mB\r
+ yWPnrLvsHs9W3WIOYIrisklJzcksSy3St0vgyrj+tqjgFXfFjCllDYy7OLsYOTkkBEwk5n9b\r
+ zgJhi0lcuLeerYuRi0NIYDaTxKT7exkhnI2MEhevNLNCOHeYJOZe7GGGcOYySryf95YJpJ9N\r
+ QENi2/7ljCC2iIC0xM67s1lBbGYBR4nP+xexgdjCAtYSq3tWgdWzCKhKnP2/FKyGV8BBYuL8\r
+ Y4wQd8hJNNz4BFbPCdT7/98CsBohoJrW01uZJzDyL2BkWMUom5JbpZubmJlTnJqsW5ycmJeX\r
+ WqRrqpebWaKXmlK6iREURuwuSjsYfx5UOsQowMGoxMPrEHorWIg1say4MvcQoyQHk5Ior81H\r
+ oBBfUn5KZUZicUZ8UWlOavEhRgkOZiUR3pcfgHK8KYmVValF+TApaQ4WJXHet9ZWwUIC6Ykl\r
+ qdmpqQWpRTBZGQ4OJQneM1+BGgWLUtNTK9Iyc0oQ0kwcnCDDeYCGXwOp4S0uSMwtzkyHyJ9i\r
+ VJQS590DkhAASWSU5sH1wuL8FaM40CvCvA9BqniAKQKu+xXQYCagwc9vXQcZXJKIkJJqYGST\r
+ vlzRWOjmlCYjuPag+ITdl/573LvlI7mYY868Y2c3a2X+r/ASC+p5I6S2/2Hp7KvCN0+GRTXM\r
+ CTukc+2kuZrJtE1uqknL72Zrrxdp/RNubNzwoyJSw/L3+9aTB3VC1ikHXzwt+jr/8FqFc+t8\r
+ ew1+JUg9PFFQZzV9l9QRlofBzQsC38uziyixFGckGmoxFxUnAgB4UsRrzgIAAA==\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: Fri, 01 Aug 2014 02:10:17 -0000\r
+\r
+Because of limitations in the C type system, we can't a strtok_len\r
+that can work on both const string and non-const strings. The C\r
+library solves this by taking a const char* and returning a char*\r
+in functions like this (e.g., strchr), but that's not const-safe.\r
+Solve it by introducing strtok_len_c, a version of strtok_len for\r
+const strings.\r
+---\r
+ util/string-util.c | 8 ++++++++\r
+ util/string-util.h | 3 +++\r
+ 2 files changed, 11 insertions(+)\r
+\r
+diff --git a/util/string-util.c b/util/string-util.c\r
+index 3e7066c..a90501e 100644\r
+--- a/util/string-util.c\r
++++ b/util/string-util.c\r
+@@ -37,6 +37,14 @@ strtok_len (char *s, const char *delim, size_t *len)\r
+ return *len ? s : NULL;\r
+ }\r
+ \r
++const char *\r
++strtok_len_c (const char *s, const char *delim, size_t *len)\r
++{\r
++ /* strtok_len is already const-safe, but we can't express both\r
++ * versions in the C type system. */\r
++ return strtok_len ((char*)s, delim, len);\r
++}\r
++\r
+ char *\r
+ sanitize_string (const void *ctx, const char *str)\r
+ {\r
+diff --git a/util/string-util.h b/util/string-util.h\r
+index ccad17f..e409cb3 100644\r
+--- a/util/string-util.h\r
++++ b/util/string-util.h\r
+@@ -23,6 +23,9 @@ extern "C" {\r
+ \r
+ char *strtok_len (char *s, const char *delim, size_t *len);\r
+ \r
++/* Const version of strtok_len. */\r
++const char *strtok_len_c (const char *s, const char *delim, size_t *len);\r
++\r
+ /* Return a talloced string with str sanitized.\r
+ *\r
+ * Whitespace characters (tabs and newlines) are replaced with spaces,\r
+-- \r
+2.0.0\r
+\r
projects / notmuch-archives.git / commitdiff