--- /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 B13F2429E40\r
+ for <notmuch@notmuchmail.org>; Tue, 29 Jul 2014 09:49:12 -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 Ze3SmhrymQ7T for <notmuch@notmuchmail.org>;\r
+ Tue, 29 Jul 2014 09:49:06 -0700 (PDT)\r
+Received: from dmz-mailsec-scanner-3.mit.edu (dmz-mailsec-scanner-3.mit.edu\r
+ [18.9.25.14])\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 3026A431FD8\r
+ for <notmuch@notmuchmail.org>; Tue, 29 Jul 2014 09:48:30 -0700 (PDT)\r
+X-AuditID: 1209190e-f79946d000007db1-ff-53d7d05d6d7e\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-3.mit.edu (Symantec Messaging Gateway) with SMTP\r
+ id AC.F5.32177.D50D7D35; Tue, 29 Jul 2014 12:48:29 -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 s6TGmIIJ002608; \r
+ Tue, 29 Jul 2014 12:48:18 -0400\r
+Received: from drake.dyndns.org (31-33-71.wireless.csail.mit.edu\r
+ [128.31.33.71]) (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 s6TGmFJt030248\r
+ (version=TLSv1/SSLv3 cipher=AES256-SHA bits=256 verify=NOT);\r
+ Tue, 29 Jul 2014 12:48:17 -0400\r
+Received: from amthrax by drake.dyndns.org with local (Exim 4.77)\r
+ (envelope-from <amdragon@mit.edu>)\r
+ id 1XCAZS-0007Gg-O0; Tue, 29 Jul 2014 12:48:14 -0400\r
+From: Austin Clements <amdragon@MIT.EDU>\r
+To: notmuch@notmuchmail.org\r
+Subject: [PATCH v2 03/14] util: Const version of strtok_len\r
+Date: Tue, 29 Jul 2014 12:48:01 -0400\r
+Message-Id: <1406652492-27803-4-git-send-email-amdragon@mit.edu>\r
+X-Mailer: git-send-email 2.0.0\r
+In-Reply-To: <1406652492-27803-1-git-send-email-amdragon@mit.edu>\r
+References: <1406652492-27803-1-git-send-email-amdragon@mit.edu>\r
+X-Brightmail-Tracker:\r
+ H4sIAAAAAAAAA+NgFtrNIsWRmVeSWpSXmKPExsUixG6nrht74XqwQedbVYvVc3ksrt+cyezA\r
+ 5LFz1l12j2erbjEHMEVx2aSk5mSWpRbp2yVwZVx/W1TwirtixpSyBsZdnF2MnBwSAiYSOy5v\r
+ Y4SwxSQu3FvP1sXIxSEkMJtJYseEOYwQzkZGiR+XrrNDOMeYJI6232WBcOYySsy4sJ4FpJ9N\r
+ QENi2/7lYLNEBKQldt6dzQpiMws4Snzev4gNxBYWsJaYuvccWD2LgKrEnTt9YDavgINE/5EX\r
+ LBB3yEk03PgEVs8J1Hvr3l0mEFsIqObQrM0sExj5FzAyrGKUTcmt0s1NzMwpTk3WLU5OzMtL\r
+ LdI11svNLNFLTSndxAgKI05Jvh2MXw8qHWIU4GBU4uHdMPdasBBrYllxZe4hRkkOJiVRXr19\r
+ 14OF+JLyUyozEosz4otKc1KLDzFKcDArifDynQXK8aYkVlalFuXDpKQ5WJTEed9aWwULCaQn\r
+ lqRmp6YWpBbBZGU4OJQkeF+fB2oULEpNT61Iy8wpQUgzcXCCDOcBGr4PpIa3uCAxtzgzHSJ/\r
+ ilFRSpx3E0hCACSRUZoH1wuL81eM4kCvCPMeBKniAaYIuO5XQIOZgAazuoANLklESEk1MBqv\r
+ 0bQ6//lX1iy/G3n7FzwNv3T0nodr6Ms7DVLTxIKWzix+eTFi41nVu5w7g7cknarlKXWRv/+r\r
+ l0+jaWeoxbvPK7bUW//Y++9eiKJc3EmRAjmf6QbHm24eMnzJ4/sqe1bCYXvOG9WpfQIH9rCd\r
+ evTGXPDViiMv5RfmOs1j567nW+k4LV7vnZYSS3FGoqEWc1FxIgCZUloLzgIAAA==\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: Tue, 29 Jul 2014 16:49:13 -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