svn commit: samba r17482 - in branches/SOC/mkhl/ldb-map/modules: .
mkhl at samba.org
mkhl at samba.org
Thu Aug 10 16:24:12 GMT 2006
Author: mkhl
Date: 2006-08-10 16:24:12 +0000 (Thu, 10 Aug 2006)
New Revision: 17482
WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=17482
Log:
Add missing comments, rename the `map_flarp' function.
Martin
Modified:
branches/SOC/mkhl/ldb-map/modules/ldb_map.c
Changeset:
Modified: branches/SOC/mkhl/ldb-map/modules/ldb_map.c
===================================================================
--- branches/SOC/mkhl/ldb-map/modules/ldb_map.c 2006-08-10 15:29:15 UTC (rev 17481)
+++ branches/SOC/mkhl/ldb-map/modules/ldb_map.c 2006-08-10 16:24:12 UTC (rev 17482)
@@ -648,7 +648,6 @@
/* Split attributes that stay in the local partition from those that
* are mapped into the remote partition. */
-/* TODO: map_search doesn't use this function currently... */
static
int
map_attrs_partition(struct ldb_module *module,
@@ -664,7 +663,7 @@
return 0;
}
-/* TODO: comment me! */
+/* Merge two lists of attributes into a single one. */
static
int
map_attrs_merge(struct ldb_module *module,
@@ -1290,7 +1289,7 @@
return True; /* no parse tree */
}
-/* TODO: Comment me! */
+/* Collect a list of attributes required to match a given parse tree. */
static
int
ldb_parse_tree_collect_attrs(struct ldb_module *module,
@@ -1710,17 +1709,18 @@
return 0;
}
-/* TODO: Comment me! */
-/* TODO: Rename me! */
+/* Collect a list of attributes required either explicitly from a
+ * given list or implicitly from a given parse tree; split the
+ * collected list into local and remote parts. */
static
int
-map_flarp(struct ldb_module *module,
- void *local_ctx,
- void *remote_ctx,
- const char ***local_attrs,
- const char ***remote_attrs,
- const char * const *search_attrs,
- const struct ldb_parse_tree *tree)
+map_attrs_collect_and_partition(struct ldb_module *module,
+ void *local_ctx,
+ void *remote_ctx,
+ const char ***local_attrs,
+ const char ***remote_attrs,
+ const char * const *search_attrs,
+ const struct ldb_parse_tree *tree)
{
void *tmp_ctx;
const char **tree_attrs;
@@ -2417,7 +2417,7 @@
ac->search_reqs[0]->callback = map_remote_search_callback;
/* Split local from remote attrs */
- ret = map_flarp(module, ac, ac->search_reqs[0], &local_attrs, &remote_attrs, req->op.search.attrs, req->op.search.tree);
+ ret = map_attrs_collect_and_partition(module, ac, ac->search_reqs[0], &local_attrs, &remote_attrs, req->op.search.attrs, req->op.search.tree);
if (ret) {
goto failed;
}
More information about the samba-cvs
mailing list