commit 6c75e0a78abc87441acfc8725acd90b1c2bb2f1c
author Carl Shapiro <cshapiro@google.com> Tue Mar 16 16:14:08 2010 -0700
committer Android Git Automerger <android-git-automerger@android.com> Tue Mar 16 16:14:08 2010 -0700
tree a13e354bede2c7bb9a127b953a1594ab7d389d9d
parent f85e98f54ce3f93031ad0106413d0cfa201ae6d3
parent 1b4cf5beb9a24d060d51142e2efa5842a66b2c03

am 288de8e6: Merge "Replace a use of index with strchr."

Merge commit '288de8e67b5a2c2e6a19372a2b99f17ca17de2fa' into dalvik-dev

* commit '288de8e67b5a2c2e6a19372a2b99f17ca17de2fa':
  Replace a use of index with strchr.

luni/src/main/native/org_apache_harmony_luni_platform_OSNetworkSystem.cpp

diff --git a/luni/src/main/native/org_apache_harmony_luni_platform_OSNetworkSystem.cpp b/luni/src/main/native/org_apache_harmony_luni_platform_OSNetworkSystem.cpp
index 82f213c..f38f29c 100644
--- a/luni/src/main/native/org_apache_harmony_luni_platform_OSNetworkSystem.cpp
+++ b/luni/src/main/native/org_apache_harmony_luni_platform_OSNetworkSystem.cpp
@@ -525,7 +525,7 @@
 
     // Accept IPv6 addresses (only) in square brackets for compatibility.
     if (ipString[0] == '[' && ipString[byteCount - 1] == ']' &&
-            index(ipString, ':') != NULL) {
+            strchr(ipString, ':') != NULL) {
         memmove(ipString, ipString + 1, byteCount - 2);
         ipString[byteCount - 2] = '\0';
     }