[PATCH] Replace index(3) with strchr(3)

[PATCH] Replace index(3) with strchr(3)

[Fredrik Fornwall]

The index(3) function has been deprecated in POSIX since 2001 and
removed in 2008, and most code in notmuch already calls strchr(3).

This fixes a compilation error on Android whose libc does not have
index(3).
---
 lib/message-property.cc | 2 +-
 lib/message.cc          | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/lib/message-property.cc b/lib/message-property.cc
index 0b13cac..f32d555 100644
--- a/lib/message-property.cc
+++ b/lib/message-property.cc
@@ -51,7 +51,7 @@ _notmuch_message_modify_property (notmuch_message_t *message, const char *key, c
     if (key == NULL || value == NULL)
 	return NOTMUCH_STATUS_NULL_POINTER;
 
-    if (index (key, '='))
+    if (strchr (key, '='))
 	return NOTMUCH_STATUS_ILLEGAL_ARGUMENT;
 
     term = talloc_asprintf (message, "%s=%s", key, value);
diff --git a/lib/message.cc b/lib/message.cc
index f8215a4..c272119 100644
--- a/lib/message.cc
+++ b/lib/message.cc
@@ -1843,7 +1843,7 @@ _notmuch_message_ensure_property_map (notmuch_message_t *message)
 	const char *key;
 	char *value;
 
-	value = index(node->string, '=');
+	value = strchr(node->string, '=');
 	if (!value)
 	    INTERNAL_ERROR ("malformed property term");
 
-- 
2.9.3

Re: [PATCH] Replace index(3) with strchr(3)

[David Bremner]

Fredrik Fornwall <fredrik@fornwall.net> writes:

> The index(3) function has been deprecated in POSIX since 2001 and
> removed in 2008, and most code in notmuch already calls strchr(3).
>

pushed to master (some time ago)

d