[SCM] Samba Shared Repository - branch master updated
Andreas Schneider
asn at samba.org
Fri Oct 18 10:59:03 UTC 2019
The branch, master has been updated
via 7c83b1ade7a dsdb: Change LDB_TYPESAFE_QSORT() to TYPESAFE_QSORT() in operational module
via 5bc35614253 s4-rpc_server: Change LDB_TYPESAFE_QSORT() to TYPESAFE_QSORT() in getncchanges
via 517342399c0 dsdb: Change LDB_TYPESAFE_QSORT() to TYPESAFE_QSORT() in repl_meta_data module
from 25b1e478ec5 s3/dump_core: Have a newline towards the end of log message
https://git.samba.org/?p=samba.git;a=shortlog;h=master
- Log -----------------------------------------------------------------
commit 7c83b1ade7a79770689d876e985e245f5af276ad
Author: Andrew Bartlett <abartlet at samba.org>
Date: Wed Oct 16 16:47:26 2019 +1300
dsdb: Change LDB_TYPESAFE_QSORT() to TYPESAFE_QSORT() in operational module
This call does not use the context argument so no additional parameter is needed.
Signed-off-by: Andrew Bartlett <abartlet at samba.org>
Reviewed-by: David Mulder <dmulder at suse.com>
Reviewed-by: Andreas Schneider <asn at samba.org>
Autobuild-User(master): Andreas Schneider <asn at cryptomilk.org>
Autobuild-Date(master): Fri Oct 18 10:58:45 UTC 2019 on sn-devel-184
commit 5bc35614253b4769590813249274355fd3d2ae53
Author: Andrew Bartlett <abartlet at samba.org>
Date: Wed Oct 16 16:39:35 2019 +1300
s4-rpc_server: Change LDB_TYPESAFE_QSORT() to TYPESAFE_QSORT() in getncchanges
This call does not use the context argument so no additional parameter is needed.
Signed-off-by: Andrew Bartlett <abartlet at samba.org>
Reviewed-by: David Mulder <dmulder at suse.com>
Reviewed-by: Andreas Schneider <asn at samba.org>
commit 517342399c0a558fc016d06ce7728f3c56ef952e
Author: Andrew Bartlett <abartlet at samba.org>
Date: Wed Oct 16 16:38:38 2019 +1300
dsdb: Change LDB_TYPESAFE_QSORT() to TYPESAFE_QSORT() in repl_meta_data module
This call does not use the context argument so no additional parameter is needed.
Signed-off-by: Andrew Bartlett <abartlet at samba.org>
Reviewed-by: David Mulder <dmulder at suse.com>
Reviewed-by: Andreas Schneider <asn at samba.org>
-----------------------------------------------------------------------
Summary of changes:
source4/dsdb/samdb/ldb_modules/operational.c | 5 ++---
source4/dsdb/samdb/ldb_modules/repl_meta_data.c | 7 +++----
source4/rpc_server/drsuapi/getncchanges.c | 14 ++++++--------
3 files changed, 11 insertions(+), 15 deletions(-)
Changeset truncated at 500 lines:
diff --git a/source4/dsdb/samdb/ldb_modules/operational.c b/source4/dsdb/samdb/ldb_modules/operational.c
index 86e43e124af..5eaebf98141 100644
--- a/source4/dsdb/samdb/ldb_modules/operational.c
+++ b/source4/dsdb/samdb/ldb_modules/operational.c
@@ -1035,8 +1035,7 @@ static int get_pso_count(struct ldb_module *module, TALLOC_CTX *mem_ctx,
* The PSO with the lowest precedence is better, otherwise (if the precedence
* is equal) the PSO with the lower GUID wins.
*/
-static int pso_compare(struct ldb_message **m1, struct ldb_message **m2,
- TALLOC_CTX *mem_ctx)
+static int pso_compare(struct ldb_message **m1, struct ldb_message **m2)
{
uint32_t prec1;
uint32_t prec2;
@@ -1134,7 +1133,7 @@ static int pso_find_best(struct ldb_module *module, TALLOC_CTX *mem_ctx,
}
/* sort the list so that the best PSO is first */
- LDB_TYPESAFE_QSORT(res->msgs, res->count, mem_ctx, pso_compare);
+ TYPESAFE_QSORT(res->msgs, res->count, pso_compare);
if (res->count > 0) {
*best_pso = res->msgs[0];
diff --git a/source4/dsdb/samdb/ldb_modules/repl_meta_data.c b/source4/dsdb/samdb/ldb_modules/repl_meta_data.c
index c92a7a6f337..c16ea7bb616 100644
--- a/source4/dsdb/samdb/ldb_modules/repl_meta_data.c
+++ b/source4/dsdb/samdb/ldb_modules/repl_meta_data.c
@@ -892,8 +892,7 @@ static int add_uint64_element(struct ldb_context *ldb, struct ldb_message *msg,
}
static int replmd_replPropertyMetaData1_attid_sort(const struct replPropertyMetaData1 *m1,
- const struct replPropertyMetaData1 *m2,
- const uint32_t *rdn_attid)
+ const struct replPropertyMetaData1 *m2)
{
/*
* This assignment seems inoccous, but it is critical for the
@@ -943,8 +942,8 @@ static int replmd_replPropertyMetaDataCtr1_sort_and_verify(struct ldb_context *l
struct ldb_dn *dn)
{
/* Note this is O(n^2) for the almost-sorted case, which this is */
- LDB_TYPESAFE_QSORT(ctr1->array, ctr1->count, NULL,
- replmd_replPropertyMetaData1_attid_sort);
+ TYPESAFE_QSORT(ctr1->array, ctr1->count,
+ replmd_replPropertyMetaData1_attid_sort);
return replmd_replPropertyMetaDataCtr1_verify(ldb, ctr1, dn);
}
diff --git a/source4/rpc_server/drsuapi/getncchanges.c b/source4/rpc_server/drsuapi/getncchanges.c
index 9a4da547e04..c9b0f65d263 100644
--- a/source4/rpc_server/drsuapi/getncchanges.c
+++ b/source4/rpc_server/drsuapi/getncchanges.c
@@ -179,7 +179,7 @@ static int uint32_t_cmp(uint32_t a1, uint32_t a2)
return a1 > a2 ? 1 : -1;
}
-static int uint32_t_ptr_cmp(uint32_t *a1, uint32_t *a2, void *unused)
+static int uint32_t_ptr_cmp(uint32_t *a1, uint32_t *a2)
{
if (*a1 == *a2) return 0;
return *a1 > *a2 ? 1 : -1;
@@ -992,8 +992,7 @@ static WERROR get_nc_changes_udv(struct ldb_context *sam_ctx,
/* comparison function for linked attributes - see CompareLinks() in
* MS-DRSR section 4.1.10.5.17 */
static int linked_attribute_compare(const struct la_for_sorting *la1,
- const struct la_for_sorting *la2,
- void *opaque)
+ const struct la_for_sorting *la2)
{
int c;
c = memcmp(la1->source_guid,
@@ -2086,7 +2085,7 @@ static WERROR getncchanges_get_sorted_array(const struct drsuapi_DsReplicaLinked
TALLOC_FREE(frame);
}
- LDB_TYPESAFE_QSORT(guid_array, link_count, NULL, linked_attribute_compare);
+ TYPESAFE_QSORT(guid_array, link_count, linked_attribute_compare);
*ret_array = guid_array;
@@ -3244,10 +3243,9 @@ allowed:
NULL);
}
- LDB_TYPESAFE_QSORT(local_pas,
- req10->partial_attribute_set->num_attids,
- NULL,
- uint32_t_ptr_cmp);
+ TYPESAFE_QSORT(local_pas,
+ req10->partial_attribute_set->num_attids,
+ uint32_t_ptr_cmp);
}
/*
--
Samba Shared Repository
More information about the samba-cvs
mailing list