Remove rawmemchr calls - found by Ira Cooper. These are glibc-specific calls, makes...

Autobuild-User: Jeremy Allison <jra@samba.org>
Autobuild-Date: Fri Nov 18 23:50:50 CET 2011 on sn-devel-104

diff --git a/source3/utils/net_registry_check.c b/source3/utils/net_registry_check.c
index 22d18a68afab6f1a713b7f9c9459a53667de86af..0936aea3b49b46b9a27a1115230785ab8568f9cc 100644 (file)
--- a/source3/utils/net_registry_check.c
+++ b/source3/utils/net_registry_check.c
@@ -212,10 +212,10 @@ static bool tdb_data_is_empty(TDB_DATA d) {
 }
 
 static bool tdb_data_is_cstr(TDB_DATA d) {
-       if (tdb_data_is_empty(d) || (d.dptr[d.dsize-1] != '\0')) {
+       if (tdb_data_is_empty(d)) {
                return false;
        }
-       return rawmemchr(d.dptr, '\0') == &d.dptr[d.dsize-1];
+       return (d.dptr[d.dsize-1] == '\0');
 }
 
 static char* tdb_data_print(TALLOC_CTX *mem_ctx, TDB_DATA d)
@@ -668,7 +668,8 @@ static bool srprs_path(const char **ptr, const char* prefix, char sep,
                return false;
        }
        *ppath = path;
-       *ptr = rawmemchr(pos, '\0');
+       /* We know pos ends in '\0'. */
+       *ptr = &pos[strlen(pos)];
        return true;
 }