From: Jo Sutton Date: Mon, 12 Feb 2024 22:53:07 +0000 (+1300) Subject: ldb: Remove trailing whitespace X-Git-Tag: tdb-1.4.11~1722 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=f810ea94f334fed8a4a20b87a4d479ed80c4f8ea;p=thirdparty%2Fsamba.git ldb: Remove trailing whitespace Signed-off-by: Jo Sutton Reviewed-by: Andrew Bartlett --- diff --git a/lib/ldb/common/ldb_controls.c b/lib/ldb/common/ldb_controls.c index 47e113a5129..b345506a083 100644 --- a/lib/ldb/common/ldb_controls.c +++ b/lib/ldb/common/ldb_controls.c @@ -1,4 +1,4 @@ -/* +/* ldb database library Copyright (C) Simo Sorce 2005 @@ -6,7 +6,7 @@ ** NOTE! The following LGPL license applies to the ldb ** library. This does NOT imply that all of Samba is released ** under the LGPL - + This library is free software; you can redistribute it and/or modify it under the terms of the GNU Lesser General Public License as published by the Free Software Foundation; either @@ -120,8 +120,8 @@ int ldb_save_controls(struct ldb_control *exclude, struct ldb_request *req, stru * * Returns NULL on error (OOM) or an empty control list. */ -struct ldb_control **ldb_controls_except_specified(struct ldb_control **controls_in, - TALLOC_CTX *mem_ctx, +struct ldb_control **ldb_controls_except_specified(struct ldb_control **controls_in, + TALLOC_CTX *mem_ctx, struct ldb_control *exclude) { struct ldb_control **lcs = NULL; @@ -186,7 +186,7 @@ int ldb_request_add_control(struct ldb_request *req, const char *oid, bool criti struct ldb_control **ctrls; struct ldb_control *ctrl; - for (n=0; req->controls && req->controls[n];n++) { + for (n=0; req->controls && req->controls[n];n++) { /* having two controls of the same OID makes no sense */ if (req->controls[n]->oid && strcmp(oid, req->controls[n]->oid) == 0) { return LDB_ERR_ATTRIBUTE_OR_VALUE_EXISTS; @@ -224,12 +224,12 @@ int ldb_reply_add_control(struct ldb_reply *ares, const char *oid, bool critical struct ldb_control **ctrls; struct ldb_control *ctrl; - for (n=0; ares->controls && ares->controls[n];) { + for (n=0; ares->controls && ares->controls[n];) { /* having two controls of the same OID makes no sense */ if (ares->controls[n]->oid && strcmp(oid, ares->controls[n]->oid) == 0) { return LDB_ERR_ATTRIBUTE_OR_VALUE_EXISTS; } - n++; + n++; } ctrls = talloc_realloc(ares, ares->controls, @@ -1338,5 +1338,3 @@ struct ldb_control **ldb_parse_control_strings(struct ldb_context *ldb, TALLOC_C return ctrl; } - - diff --git a/lib/ldb/include/ldb_module.h b/lib/ldb/include/ldb_module.h index e3f3d994aef..4ad48f3dbc2 100644 --- a/lib/ldb/include/ldb_module.h +++ b/lib/ldb/include/ldb_module.h @@ -146,7 +146,7 @@ struct ldb_module_ops { /* The following definitions come from lib/ldb/common/ldb_debug.c */ void ldb_debug(struct ldb_context *ldb, enum ldb_debug_level level, const char *fmt, ...) PRINTF_ATTRIBUTE(3, 4); -void ldb_debug_set(struct ldb_context *ldb, enum ldb_debug_level level, +void ldb_debug_set(struct ldb_context *ldb, enum ldb_debug_level level, const char *fmt, ...) PRINTF_ATTRIBUTE(3, 4); void ldb_debug_add(struct ldb_context *ldb, const char *fmt, ...) PRINTF_ATTRIBUTE(2, 3); void ldb_debug_end(struct ldb_context *ldb, enum ldb_debug_level level); @@ -176,7 +176,7 @@ int ldb_schema_attribute_add_with_syntax(struct ldb_context *ldb, const char *name, unsigned flags, const struct ldb_schema_syntax *syntax); -int ldb_schema_attribute_add(struct ldb_context *ldb, +int ldb_schema_attribute_add(struct ldb_context *ldb, const char *name, unsigned flags, const char *syntax); @@ -226,8 +226,8 @@ void ldb_schema_set_override_GUID_index(struct ldb_context *ldb, const char *GUID_index_dn_component); /* A useful function to build comparison functions with */ -int ldb_any_comparison(struct ldb_context *ldb, void *mem_ctx, - ldb_attr_handler_t canonicalise_fn, +int ldb_any_comparison(struct ldb_context *ldb, void *mem_ctx, + ldb_attr_handler_t canonicalise_fn, const struct ldb_val *v1, const struct ldb_val *v2); @@ -236,8 +236,8 @@ int ldb_save_controls(struct ldb_control *exclude, struct ldb_request *req, stru /* Returns a list of controls, except the one specified. Included * controls become a child of returned list if they were children of * controls_in */ -struct ldb_control **ldb_controls_except_specified(struct ldb_control **controls_in, - TALLOC_CTX *mem_ctx, +struct ldb_control **ldb_controls_except_specified(struct ldb_control **controls_in, + TALLOC_CTX *mem_ctx, struct ldb_control *exclude); int ldb_check_critical_controls(struct ldb_control **controls);