From 2fd28dc4cf4f40a690adfd846911e4da1a776bf2 Mon Sep 17 00:00:00 2001 From: Volker Lendecke Date: Wed, 13 Jun 2012 09:48:25 +0200 Subject: s3: Simplify tdb_data_is_cstr a bit The original code contained rawmemchr for performance reasons. I would expect the very common strlen routine to be not much worse performance-wise than rawmemchr. On top, for me this patch simplifies the expression a bit. Signed-off-by: Michael Adam Autobuild-User(master): Michael Adam Autobuild-Date(master): Thu Jun 14 16:55:58 CEST 2012 on sn-devel-104 --- source3/utils/net_registry_check.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/source3/utils/net_registry_check.c b/source3/utils/net_registry_check.c index 6e455db2d8..58cd9f6054 100644 --- a/source3/utils/net_registry_check.c +++ b/source3/utils/net_registry_check.c @@ -211,7 +211,7 @@ static bool tdb_data_is_cstr(TDB_DATA d) { if (tdb_data_is_empty(d) || (d.dptr[d.dsize-1] != '\0')) { return false; } - return strchr((char *)d.dptr, '\0') == (char *)&d.dptr[d.dsize-1]; + return strlen((char *)d.dptr) == d.dsize-1; } static char* tdb_data_print(TALLOC_CTX *mem_ctx, TDB_DATA d) -- cgit