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

r19134: Merge the second set of C++ warning fixes from Samba3. I'll leave r19132 to

Browse Source 
metze to merge until the questions have been answered.

Volker
(This used to be commit e946717bf6)
This commit is contained in:
Volker Lendecke 2006-10-06 15:03:41 +00:00 committed by Gerald (Jerry) Carter
parent ff4e832130
commit 109bf77ea3
1 changed files with 12 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
source4/lib/ldb/ldb_tdb/ldb_tdb.c
View File

@ -219,7 +219,8 @@ static int ltdb_modified(struct ldb_module *module, const struct ldb_dn *dn)
*/ */
int ltdb_store(struct ldb_module *module, const struct ldb_message *msg, int flgs) int ltdb_store(struct ldb_module *module, const struct ldb_message *msg, int flgs)
{ {
struct ltdb_private *ltdb = module->private_data; struct ltdb_private *ltdb =
talloc_get_type(module->private_data, struct ltdb_private);
TDB_DATA tdb_key, tdb_data; TDB_DATA tdb_key, tdb_data;
int ret; int ret;
@ -332,7 +333,8 @@ done:
*/ */
int ltdb_delete_noindex(struct ldb_module *module, const struct ldb_dn *dn) int ltdb_delete_noindex(struct ldb_module *module, const struct ldb_dn *dn)
{ {
struct ltdb_private *ltdb = module->private_data; struct ltdb_private *ltdb =
talloc_get_type(module->private_data, struct ltdb_private);
TDB_DATA tdb_key; TDB_DATA tdb_key;
int ret; int ret;
@ -589,7 +591,8 @@ static int msg_delete_element(struct ldb_module *module,
int ltdb_modify_internal(struct ldb_module *module, const struct ldb_message *msg) int ltdb_modify_internal(struct ldb_module *module, const struct ldb_message *msg)
{ {
struct ldb_context *ldb = module->ldb; struct ldb_context *ldb = module->ldb;
struct ltdb_private *ltdb = module->private_data; struct ltdb_private *ltdb =
talloc_get_type(module->private_data, struct ltdb_private);
TDB_DATA tdb_key, tdb_data; TDB_DATA tdb_key, tdb_data;
struct ldb_message *msg2; struct ldb_message *msg2;
unsigned i, j; unsigned i, j;
@ -873,7 +876,8 @@ done:
static int ltdb_start_trans(struct ldb_module *module) static int ltdb_start_trans(struct ldb_module *module)
{ {
struct ltdb_private *ltdb = module->private_data; struct ltdb_private *ltdb =
talloc_get_type(module->private_data, struct ltdb_private);
if (tdb_transaction_start(ltdb->tdb) != 0) { if (tdb_transaction_start(ltdb->tdb) != 0) {
return ltdb_err_map(tdb_error(ltdb->tdb)); return ltdb_err_map(tdb_error(ltdb->tdb));
@ -884,7 +888,8 @@ static int ltdb_start_trans(struct ldb_module *module)
static int ltdb_end_trans(struct ldb_module *module) static int ltdb_end_trans(struct ldb_module *module)
{ {
struct ltdb_private *ltdb = module->private_data; struct ltdb_private *ltdb =
talloc_get_type(module->private_data, struct ltdb_private);
if (tdb_transaction_commit(ltdb->tdb) != 0) { if (tdb_transaction_commit(ltdb->tdb) != 0) {
return ltdb_err_map(tdb_error(ltdb->tdb)); return ltdb_err_map(tdb_error(ltdb->tdb));
@ -895,7 +900,8 @@ static int ltdb_end_trans(struct ldb_module *module)
static int ltdb_del_trans(struct ldb_module *module) static int ltdb_del_trans(struct ldb_module *module)
{ {
struct ltdb_private *ltdb = module->private_data; struct ltdb_private *ltdb =
talloc_get_type(module->private_data, struct ltdb_private);
if (tdb_transaction_cancel(ltdb->tdb) != 0) { if (tdb_transaction_cancel(ltdb->tdb) != 0) {
return ltdb_err_map(tdb_error(ltdb->tdb)); return ltdb_err_map(tdb_error(ltdb->tdb));