From 500d1ba546ff3a677f0a48edc233daeed4d1fe41 Mon Sep 17 00:00:00 2001 From: Matthias Dieter Wallnöfer Date: Wed, 21 Sep 2011 12:38:46 +0200 Subject: ldb:ldb.c/"ldb_wait" - change "ldb_wait" slightly in order to introduce error messages In this occasion remove a redundant check for "LDB_ASYNC_DONE": if (handle->state == LDB_ASYNC_DONE || if (handle->state == LDB_ASYNC_DONE) handle->status != LDB_SUCCESS) { return handle->status; return handle->status; == if (handle->status != LDB_SUCCESS) } return handle->status; ... ... return LDB_SUCCESS; return LDB_SUCCESS; Signed-off-by: Andrew Tridgell --- lib/ldb/common/ldb.c | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) (limited to 'lib/ldb/common') diff --git a/lib/ldb/common/ldb.c b/lib/ldb/common/ldb.c index 0c5f40ae4b..d753bf7bd2 100644 --- a/lib/ldb/common/ldb.c +++ b/lib/ldb/common/ldb.c @@ -596,8 +596,7 @@ int ldb_wait(struct ldb_handle *handle, enum ldb_wait_type type) if (ret != 0) { return LDB_ERR_OPERATIONS_ERROR; } - if (handle->state == LDB_ASYNC_DONE || - handle->status != LDB_SUCCESS) { + if (handle->status != LDB_SUCCESS) { return handle->status; } break; @@ -612,7 +611,10 @@ int ldb_wait(struct ldb_handle *handle, enum ldb_wait_type type) return handle->status; } } - return handle->status; + if (handle->status != LDB_SUCCESS) { + return handle->status; + } + break; } return LDB_SUCCESS; -- cgit