From: Austin Clements <amdragon@MIT.EDU>
To: notmuch@notmuchmail.org
Subject: [PATCH 03/14] util: Const version of strtok_len
Date: Sat, 26 Jul 2014 23:52:42 -0400 [thread overview]
Message-ID: <1406433173-19169-4-git-send-email-amdragon@mit.edu> (raw)
In-Reply-To: <1406433173-19169-1-git-send-email-amdragon@mit.edu>
Because of limitations in the C type system, we can't a strtok_len
that can work on both const string and non-const strings. The C
library solves this by taking a const char* and returning a char*
in functions like this (e.g., strchr), but that's not const-safe.
Solve it by introducing strtok_len_c, a version of strtok_len for
const strings.
---
util/string-util.c | 8 ++++++++
util/string-util.h | 3 +++
2 files changed, 11 insertions(+)
diff --git a/util/string-util.c b/util/string-util.c
index 3e7066c..a90501e 100644
--- a/util/string-util.c
+++ b/util/string-util.c
@@ -37,6 +37,14 @@ strtok_len (char *s, const char *delim, size_t *len)
return *len ? s : NULL;
}
+const char *
+strtok_len_c (const char *s, const char *delim, size_t *len)
+{
+ /* strtok_len is already const-safe, but we can't express both
+ * versions in the C type system. */
+ return strtok_len ((char*)s, delim, len);
+}
+
char *
sanitize_string (const void *ctx, const char *str)
{
diff --git a/util/string-util.h b/util/string-util.h
index ccad17f..e409cb3 100644
--- a/util/string-util.h
+++ b/util/string-util.h
@@ -23,6 +23,9 @@ extern "C" {
char *strtok_len (char *s, const char *delim, size_t *len);
+/* Const version of strtok_len. */
+const char *strtok_len_c (const char *s, const char *delim, size_t *len);
+
/* Return a talloced string with str sanitized.
*
* Whitespace characters (tabs and newlines) are replaced with spaces,
--
2.0.0
next prev parent reply other threads:[~2014-07-27 3:53 UTC|newest]
Thread overview: 23+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-07-27 3:52 [PATCH 0/14] Implement and use database "features" Austin Clements
2014-07-27 3:52 ` [PATCH 01/14] test: Include generated dependencies for test sources Austin Clements
2014-07-27 3:52 ` [PATCH 02/14] util: Make string-util.h C++-compatible Austin Clements
2014-07-27 3:52 ` Austin Clements [this message]
2014-07-27 3:52 ` [PATCH 04/14] new: Don't report version after upgrade Austin Clements
2014-07-27 9:33 ` Mark Walters
2014-07-27 16:24 ` Austin Clements
2014-07-27 3:52 ` [PATCH 05/14] lib: Database version 3: Introduce fine-grained "features" Austin Clements
2014-07-27 9:53 ` Mark Walters
2014-07-27 16:58 ` Austin Clements
2014-07-27 3:52 ` [PATCH 06/14] test: Tool to build DB with specific version and features Austin Clements
2014-07-27 3:52 ` [PATCH 07/14] test: Tests for future version and unknown feature handling Austin Clements
2014-07-27 8:51 ` Mark Walters
2014-07-27 16:12 ` Austin Clements
2014-07-27 3:52 ` [PATCH 08/14] lib: Simplify upgrade code using a transaction Austin Clements
2014-07-27 9:35 ` Mark Walters
2014-07-27 16:42 ` Austin Clements
2014-07-27 3:52 ` [PATCH 09/14] lib: Use database features to drive upgrade Austin Clements
2014-07-27 3:52 ` [PATCH 10/14] lib: Reorganize upgrade around document types Austin Clements
2014-07-27 3:52 ` [PATCH 11/14] lib: Report progress for combined upgrade operation Austin Clements
2014-07-27 3:52 ` [PATCH 12/14] lib: Support empty header values in database Austin Clements
2014-07-27 3:52 ` [PATCH 13/14] lib: Return an error from operations that require an upgrade Austin Clements
2014-07-27 3:52 ` [PATCH 14/14] lib: Update doc of notmuch_database_{needs_upgrade, upgrade} Austin Clements
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
List information: https://notmuchmail.org/
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1406433173-19169-4-git-send-email-amdragon@mit.edu \
--to=amdragon@mit.edu \
--cc=notmuch@notmuchmail.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this public inbox
https://yhetil.org/notmuch.git/
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).