sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2024-12-27 03:21:53 +03:00
Code

r26574: Do not call functions in the variable declaration, fix checking for tmp_ctx,

Browse Source 
and also makes code more readable and debuggable.

Eliminate silly parenthesys.

Simo.
This commit is contained in:
Simo Sorce 2007-12-23 22:03:31 -06:00 committed by Stefan Metzmacher
parent 874f0ac056
commit 166195b487
1 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
source/lib/ldb/ldb_tdb/ldb_tdb.c
View File

@ -961,16 +961,20 @@ static int ltdb_request(struct ldb_module *module, struct ldb_request *req)
*/ */
static int ltdb_sequence_number(struct ldb_module *module, struct ldb_request *req) 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_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; int tret;
tmp_ctx = talloc_new(req);
if (tmp_ctx == NULL) { if (tmp_ctx == NULL) {
talloc_free(tmp_ctx); talloc_free(tmp_ctx);
return LDB_ERR_OPERATIONS_ERROR; return LDB_ERR_OPERATIONS_ERROR;
} }
dn = ldb_dn_new(tmp_ctx, module->ldb, LTDB_BASEINFO);
msg = talloc(tmp_ctx, struct ldb_message); msg = talloc(tmp_ctx, struct ldb_message);
if (msg == NULL) { if (msg == NULL) {
talloc_free(tmp_ctx); talloc_free(tmp_ctx);
@ -996,8 +1000,7 @@ static int ltdb_sequence_number(struct ldb_module *module, struct ldb_request *r
req->op.seq_num.seq_num++; req->op.seq_num.seq_num++;
break; break;
case LDB_SEQ_HIGHEST_TIMESTAMP: case LDB_SEQ_HIGHEST_TIMESTAMP:
{ date = ldb_msg_find_attr_as_string(msg, LTDB_MOD_TIMESTAMP, NULL);
const char *date = ldb_msg_find_attr_as_string(msg, LTDB_MOD_TIMESTAMP, NULL);
if (date) { if (date) {
req->op.seq_num.seq_num = ldb_string_to_time(date); req->op.seq_num.seq_num = ldb_string_to_time(date);
} else { } else {
@ -1006,7 +1009,6 @@ static int ltdb_sequence_number(struct ldb_module *module, struct ldb_request *r
} }
break; break;
} }
}
talloc_free(tmp_ctx); talloc_free(tmp_ctx);
return LDB_SUCCESS; return LDB_SUCCESS;
} }