svn commit: samba r26574 - in branches/SAMBA_4_0/source/lib/ldb/ldb_tdb: .

[idra at samba.org]

Author: idra
Date: 2007-12-23 22:03:31 +0000 (Sun, 23 Dec 2007)
New Revision: 26574

WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=26574

Log:
Do not call functions in the variable declaration, fix checking for tmp_ctx,
and also makes code more readable and debuggable.

Eliminate silly parenthesys.

Simo.


Modified:
   branches/SAMBA_4_0/source/lib/ldb/ldb_tdb/ldb_tdb.c


Changeset:
Modified: branches/SAMBA_4_0/source/lib/ldb/ldb_tdb/ldb_tdb.c
===================================================================
--- branches/SAMBA_4_0/source/lib/ldb/ldb_tdb/ldb_tdb.c	2007-12-23 21:27:58 UTC (rev 26573)
+++ branches/SAMBA_4_0/source/lib/ldb/ldb_tdb/ldb_tdb.c	2007-12-23 22:03:31 UTC (rev 26574)
@@ -961,16 +961,20 @@
 */
 static int ltdb_sequence_number(struct ldb_module *module, struct ldb_request *req)
 {
-	TALLOC_CTX *tmp_ctx = talloc_new(req);
+	TALLOC_CTX *tmp_ctx;
 	struct ldb_message *msg = NULL;
-	struct ldb_dn *dn = ldb_dn_new(tmp_ctx, module->ldb, LTDB_BASEINFO);
+	struct ldb_dn *dn;
+	const char *date;
 	int tret;
 
+	tmp_ctx = talloc_new(req);
 	if (tmp_ctx == NULL) {
 		talloc_free(tmp_ctx);
 		return LDB_ERR_OPERATIONS_ERROR;
 	}
 
+	dn = ldb_dn_new(tmp_ctx, module->ldb, LTDB_BASEINFO);
+
 	msg = talloc(tmp_ctx, struct ldb_message);
 	if (msg == NULL) {
 		talloc_free(tmp_ctx);
@@ -996,8 +1000,7 @@
 		req->op.seq_num.seq_num++;
 		break;
 	case LDB_SEQ_HIGHEST_TIMESTAMP:
-	{
-		const char *date = ldb_msg_find_attr_as_string(msg, LTDB_MOD_TIMESTAMP, NULL);
+		date = ldb_msg_find_attr_as_string(msg, LTDB_MOD_TIMESTAMP, NULL);
 		if (date) {
 			req->op.seq_num.seq_num = ldb_string_to_time(date);
 		} else {
@@ -1006,7 +1009,6 @@
 		}
 		break;
 	}
-	}
 	talloc_free(tmp_ctx);
 	return LDB_SUCCESS;
 }