svn commit: samba r13781 - in
branches/tmp/samba4-ldb-register/source:
dsdb/samdb/ldb_modules lib/ldb/common lib/ldb/include
lib/ldb/ldb_ildap lib/ldb/modules
jelmer at samba.org
jelmer at samba.org
Thu Mar 2 10:13:22 GMT 2006
Author: jelmer
Date: 2006-03-02 10:13:21 +0000 (Thu, 02 Mar 2006)
New Revision: 13781
WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=13781
Log:
init -> init_context to prevent problems on some compilers.
Noted by metze.
Modified:
branches/tmp/samba4-ldb-register/source/dsdb/samdb/ldb_modules/extended_dn.c
branches/tmp/samba4-ldb-register/source/dsdb/samdb/ldb_modules/kludge_acl.c
branches/tmp/samba4-ldb-register/source/dsdb/samdb/ldb_modules/rootdse.c
branches/tmp/samba4-ldb-register/source/dsdb/samdb/ldb_modules/samldb.c
branches/tmp/samba4-ldb-register/source/lib/ldb/common/ldb_modules.c
branches/tmp/samba4-ldb-register/source/lib/ldb/include/ldb_private.h
branches/tmp/samba4-ldb-register/source/lib/ldb/ldb_ildap/ldb_ildap.c
branches/tmp/samba4-ldb-register/source/lib/ldb/modules/asq.c
branches/tmp/samba4-ldb-register/source/lib/ldb/modules/operational.c
branches/tmp/samba4-ldb-register/source/lib/ldb/modules/paged_results.c
branches/tmp/samba4-ldb-register/source/lib/ldb/modules/skel.c
branches/tmp/samba4-ldb-register/source/lib/ldb/modules/sort.c
Changeset:
Modified: branches/tmp/samba4-ldb-register/source/dsdb/samdb/ldb_modules/extended_dn.c
===================================================================
--- branches/tmp/samba4-ldb-register/source/dsdb/samdb/ldb_modules/extended_dn.c 2006-03-02 03:59:03 UTC (rev 13780)
+++ branches/tmp/samba4-ldb-register/source/dsdb/samdb/ldb_modules/extended_dn.c 2006-03-02 10:13:21 UTC (rev 13781)
@@ -290,7 +290,7 @@
static const struct ldb_module_ops extended_dn_ops = {
.name = "extended_dn",
.request = extended_request,
- .init = extended_init
+ .init_context = extended_init
};
int ldb_extended_dn_init(void)
Modified: branches/tmp/samba4-ldb-register/source/dsdb/samdb/ldb_modules/kludge_acl.c
===================================================================
--- branches/tmp/samba4-ldb-register/source/dsdb/samdb/ldb_modules/kludge_acl.c 2006-03-02 03:59:03 UTC (rev 13780)
+++ branches/tmp/samba4-ldb-register/source/dsdb/samdb/ldb_modules/kludge_acl.c 2006-03-02 10:13:21 UTC (rev 13781)
@@ -243,7 +243,7 @@
.start_transaction = kludge_acl_start_trans,
.end_transaction = kludge_acl_end_trans,
.del_transaction = kludge_acl_del_trans,
- .init = kludge_acl_init
+ .init_context = kludge_acl_init
};
int ldb_kludge_acl_init(void)
Modified: branches/tmp/samba4-ldb-register/source/dsdb/samdb/ldb_modules/rootdse.c
===================================================================
--- branches/tmp/samba4-ldb-register/source/dsdb/samdb/ldb_modules/rootdse.c 2006-03-02 03:59:03 UTC (rev 13780)
+++ branches/tmp/samba4-ldb-register/source/dsdb/samdb/ldb_modules/rootdse.c 2006-03-02 10:13:21 UTC (rev 13781)
@@ -216,9 +216,9 @@
}
static const struct ldb_module_ops rootdse_ops = {
- .name = "rootdse",
- .init = rootdse_init,
- .request = rootdse_request
+ .name = "rootdse",
+ .init_context = rootdse_init,
+ .request = rootdse_request
};
int rootdse_module_init(void)
Modified: branches/tmp/samba4-ldb-register/source/dsdb/samdb/ldb_modules/samldb.c
===================================================================
--- branches/tmp/samba4-ldb-register/source/dsdb/samdb/ldb_modules/samldb.c 2006-03-02 03:59:03 UTC (rev 13780)
+++ branches/tmp/samba4-ldb-register/source/dsdb/samdb/ldb_modules/samldb.c 2006-03-02 10:13:21 UTC (rev 13781)
@@ -827,7 +827,7 @@
static const struct ldb_module_ops samldb_ops = {
.name = "samldb",
- .init = samldb_init,
+ .init_context = samldb_init,
.request = samldb_request
};
Modified: branches/tmp/samba4-ldb-register/source/lib/ldb/common/ldb_modules.c
===================================================================
--- branches/tmp/samba4-ldb-register/source/lib/ldb/common/ldb_modules.c 2006-03-02 03:59:03 UTC (rev 13780)
+++ branches/tmp/samba4-ldb-register/source/lib/ldb/common/ldb_modules.c 2006-03-02 10:13:21 UTC (rev 13781)
@@ -257,11 +257,11 @@
module = ldb->modules;
- while (module && module->ops->init == NULL)
+ while (module && module->ops->init_context == NULL)
module = module->next;
- if (module && module->ops->init &&
- module->ops->init(module) != LDB_SUCCESS) {
+ if (module && module->ops->init_context &&
+ module->ops->init_context(module) != LDB_SUCCESS) {
ldb_debug(ldb, LDB_DEBUG_FATAL, "module initialization failed\n");
return -1;
}
@@ -293,8 +293,8 @@
int ldb_next_init(struct ldb_module *module)
{
- FIND_OP(module, init);
- return module->ops->init(module);
+ FIND_OP(module, init_context);
+ return module->ops->init_context(module);
}
int ldb_next_start_trans(struct ldb_module *module)
Modified: branches/tmp/samba4-ldb-register/source/lib/ldb/include/ldb_private.h
===================================================================
--- branches/tmp/samba4-ldb-register/source/lib/ldb/include/ldb_private.h 2006-03-02 03:59:03 UTC (rev 13780)
+++ branches/tmp/samba4-ldb-register/source/lib/ldb/include/ldb_private.h 2006-03-02 10:13:21 UTC (rev 13781)
@@ -56,7 +56,7 @@
*/
struct ldb_module_ops {
const char *name;
- int (*init) (struct ldb_module *);
+ int (*init_context) (struct ldb_module *);
int (*request)(struct ldb_module *, struct ldb_request *);
int (*start_transaction)(struct ldb_module *);
int (*end_transaction)(struct ldb_module *);
Modified: branches/tmp/samba4-ldb-register/source/lib/ldb/ldb_ildap/ldb_ildap.c
===================================================================
--- branches/tmp/samba4-ldb-register/source/lib/ldb/ldb_ildap/ldb_ildap.c 2006-03-02 03:59:03 UTC (rev 13780)
+++ branches/tmp/samba4-ldb-register/source/lib/ldb/ldb_ildap/ldb_ildap.c 2006-03-02 10:13:21 UTC (rev 13781)
@@ -905,7 +905,7 @@
.start_transaction = ildb_start_trans,
.end_transaction = ildb_end_trans,
.del_transaction = ildb_del_trans,
- .init = ildb_init
+ .init_context = ildb_init
};
Modified: branches/tmp/samba4-ldb-register/source/lib/ldb/modules/asq.c
===================================================================
--- branches/tmp/samba4-ldb-register/source/lib/ldb/modules/asq.c 2006-03-02 03:59:03 UTC (rev 13780)
+++ branches/tmp/samba4-ldb-register/source/lib/ldb/modules/asq.c 2006-03-02 10:13:21 UTC (rev 13781)
@@ -232,7 +232,7 @@
static const struct ldb_module_ops asq_ops = {
.name = "asq",
.request = asq,
- .init = asq_init
+ .init_context = asq_init
};
int ldb_asq_init(void)
Modified: branches/tmp/samba4-ldb-register/source/lib/ldb/modules/operational.c
===================================================================
--- branches/tmp/samba4-ldb-register/source/lib/ldb/modules/operational.c 2006-03-02 03:59:03 UTC (rev 13780)
+++ branches/tmp/samba4-ldb-register/source/lib/ldb/modules/operational.c 2006-03-02 10:13:21 UTC (rev 13781)
@@ -414,7 +414,7 @@
static const struct ldb_module_ops operational_ops = {
.name = "operational",
.request = operational_request,
- .init = operational_init
+ .init_context = operational_init
};
int ldb_operational_init(void)
Modified: branches/tmp/samba4-ldb-register/source/lib/ldb/modules/paged_results.c
===================================================================
--- branches/tmp/samba4-ldb-register/source/lib/ldb/modules/paged_results.c 2006-03-02 03:59:03 UTC (rev 13780)
+++ branches/tmp/samba4-ldb-register/source/lib/ldb/modules/paged_results.c 2006-03-02 10:13:21 UTC (rev 13781)
@@ -276,9 +276,9 @@
}
static const struct ldb_module_ops paged_ops = {
- .name = "paged_results",
- .request = paged_request,
- .init = paged_request_init
+ .name = "paged_results",
+ .request = paged_request,
+ .init_context = paged_request_init
};
int ldb_paged_results_init(void)
Modified: branches/tmp/samba4-ldb-register/source/lib/ldb/modules/skel.c
===================================================================
--- branches/tmp/samba4-ldb-register/source/lib/ldb/modules/skel.c 2006-03-02 03:59:03 UTC (rev 13780)
+++ branches/tmp/samba4-ldb-register/source/lib/ldb/modules/skel.c 2006-03-02 10:13:21 UTC (rev 13781)
@@ -141,7 +141,7 @@
static const struct ldb_module_ops skel_ops = {
.name = "skel",
- .init = skel_init,
+ .init_context = skel_init,
.request = skel_request,
.start_transaction = skel_start_trans,
.end_transaction = skel_end_trans,
Modified: branches/tmp/samba4-ldb-register/source/lib/ldb/modules/sort.c
===================================================================
--- branches/tmp/samba4-ldb-register/source/lib/ldb/modules/sort.c 2006-03-02 03:59:03 UTC (rev 13780)
+++ branches/tmp/samba4-ldb-register/source/lib/ldb/modules/sort.c 2006-03-02 10:13:21 UTC (rev 13781)
@@ -249,7 +249,7 @@
static const struct ldb_module_ops server_sort_ops = {
.name = "server_sort",
.request = server_sort,
- .init = server_sort_init
+ .init_context = server_sort_init
};
int ldb_sort_init(void)
More information about the samba-cvs
mailing list