summaryrefslogtreecommitdiff
path: root/source3
diff options
context:
space:
mode:
authorVolker Lendecke <vl@samba.org>2012-06-13 09:48:25 +0200
committerMichael Adam <obnox@samba.org>2012-06-14 16:55:58 +0200
commit2fd28dc4cf4f40a690adfd846911e4da1a776bf2 (patch)
treeac85c35f2026ad95f024a7d8dae611d645751652 /source3
parentbc9003dd90072191822813d15b26ef850399c1e8 (diff)
downloadsamba-2fd28dc4cf4f40a690adfd846911e4da1a776bf2.tar.gz
samba-2fd28dc4cf4f40a690adfd846911e4da1a776bf2.tar.bz2
samba-2fd28dc4cf4f40a690adfd846911e4da1a776bf2.zip
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 <obnox@samba.org> Autobuild-User(master): Michael Adam <obnox@samba.org> Autobuild-Date(master): Thu Jun 14 16:55:58 CEST 2012 on sn-devel-104
Diffstat (limited to 'source3')
-rw-r--r--source3/utils/net_registry_check.c2
1 files changed, 1 insertions, 1 deletions
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)