[SCM] Samba Shared Repository - branch master updated

Matthias Dieter Wallnöfer mdw at samba.org
Mon Mar 8 12:12:44 MST 2010


The branch, master has been updated
       via  8d3b7d4... LDB:asq module - change counters to "unsigned" where appropriate
       via  df17e1b... LDB:sort module - change counters to "unsigned" where appropriate
       via  8248069... LDB:rdn name module - change counters to "unsigned" where appropriate
       via  681c887... LDB:paged searches module - change counters to "unsigned" where appropriate
       via  7e7d9a8... LDB:paged results module - change counters to "unsigned" where appropriate
      from  a4dc50e... s3: add missing Makefile.in changes for vfs_crossrename

http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master


- Log -----------------------------------------------------------------
commit 8d3b7d418edc6955271d262bbdbf307a45b7fb7f
Author: Matthias Dieter Wallnöfer <mwallnoefer at yahoo.de>
Date:   Mon Mar 8 18:01:32 2010 +0100

    LDB:asq module - change counters to "unsigned" where appropriate

commit df17e1b962d084315ebcba78a7ebe1d659781dbf
Author: Matthias Dieter Wallnöfer <mwallnoefer at yahoo.de>
Date:   Mon Mar 8 18:01:32 2010 +0100

    LDB:sort module - change counters to "unsigned" where appropriate

commit 8248069c91922c93bf9020cc1f94b8cf59c43e28
Author: Matthias Dieter Wallnöfer <mwallnoefer at yahoo.de>
Date:   Mon Mar 8 18:01:32 2010 +0100

    LDB:rdn name module - change counters to "unsigned" where appropriate

commit 681c88798a1e16da9dc13688c1ed18659127684b
Author: Matthias Dieter Wallnöfer <mwallnoefer at yahoo.de>
Date:   Mon Mar 8 18:01:32 2010 +0100

    LDB:paged searches module - change counters to "unsigned" where appropriate

commit 7e7d9a8a4827f283d13f393404da978130baaa93
Author: Matthias Dieter Wallnöfer <mwallnoefer at yahoo.de>
Date:   Mon Mar 8 18:01:32 2010 +0100

    LDB:paged results module - change counters to "unsigned" where appropriate

-----------------------------------------------------------------------

Summary of changes:
 source4/lib/ldb/modules/asq.c            |    9 +++++----
 source4/lib/ldb/modules/paged_results.c  |    8 ++++----
 source4/lib/ldb/modules/paged_searches.c |    4 ++--
 source4/lib/ldb/modules/rdn_name.c       |    5 +++--
 source4/lib/ldb/modules/sort.c           |    9 +++++----
 5 files changed, 19 insertions(+), 16 deletions(-)


Changeset truncated at 500 lines:

diff --git a/source4/lib/ldb/modules/asq.c b/source4/lib/ldb/modules/asq.c
index 4918683..6d1e88b 100644
--- a/source4/lib/ldb/modules/asq.c
+++ b/source4/lib/ldb/modules/asq.c
@@ -55,8 +55,8 @@ struct asq_context {
 	struct ldb_reply *base_res;
 
 	struct ldb_request **reqs;
-	int num_reqs;
-	int cur_req;
+	unsigned int num_reqs;
+	unsigned int cur_req;
 
 	struct ldb_control **controls;
 };
@@ -85,7 +85,7 @@ static int asq_search_continue(struct asq_context *ac);
 static int asq_search_terminate(struct asq_context *ac)
 {
 	struct ldb_asq_control *asq;
-	int i;
+	unsigned int i;
 
 	if (ac->controls) {
 		for (i = 0; ac->controls[i]; i++) /* count em */ ;
@@ -250,7 +250,8 @@ static int asq_build_multiple_requests(struct asq_context *ac, bool *terminated)
 	struct ldb_control *control;
 	struct ldb_dn *dn;
 	struct ldb_message_element *el;
-	int ret, i;
+	unsigned int i;
+	int ret;
 
 	if (ac->base_res == NULL) {
 		return LDB_ERR_NO_SUCH_OBJECT;
diff --git a/source4/lib/ldb/modules/paged_results.c b/source4/lib/ldb/modules/paged_results.c
index ff1b92f..25b7532 100644
--- a/source4/lib/ldb/modules/paged_results.c
+++ b/source4/lib/ldb/modules/paged_results.c
@@ -65,8 +65,7 @@ struct results_store {
 };
 
 struct private_data {
-
-	int next_free_id;
+	unsigned int next_free_id;
 	struct results_store *store;
 	
 };
@@ -95,7 +94,7 @@ static int store_destructor(struct results_store *del)
 static struct results_store *new_store(struct private_data *priv)
 {
 	struct results_store *newr;
-	int new_id = priv->next_free_id++;
+	unsigned int new_id = priv->next_free_id++;
 
 	/* TODO: we should have a limit on the number of
 	 * outstanding paged searches
@@ -140,7 +139,8 @@ static int paged_results(struct paged_context *ac)
 {
 	struct ldb_paged_control *paged;
 	struct message_store *msg;
-	int i, num_ctrls, ret;
+	unsigned int i, num_ctrls;
+	int ret;
 
 	if (ac->store == NULL) {
 		return LDB_ERR_OPERATIONS_ERROR;
diff --git a/source4/lib/ldb/modules/paged_searches.c b/source4/lib/ldb/modules/paged_searches.c
index 09786c3..39780cb 100644
--- a/source4/lib/ldb/modules/paged_searches.c
+++ b/source4/lib/ldb/modules/paged_searches.c
@@ -52,7 +52,7 @@ struct ps_context {
 	bool pending;
 
 	char **saved_referrals;
-	int num_referrals;
+	unsigned int num_referrals;
 
 	struct ldb_request *down_req;
 };
@@ -132,7 +132,7 @@ static int send_referrals(struct ps_context *ac)
 {
 	struct ldb_reply *ares;
 	int ret;
-	int i;
+	unsigned int i;
 
 	for (i = 0; i < ac->num_referrals; i++) {
 		ares = talloc_zero(ac->req, struct ldb_reply);
diff --git a/source4/lib/ldb/modules/rdn_name.c b/source4/lib/ldb/modules/rdn_name.c
index 2a3c6fd..a473f25 100644
--- a/source4/lib/ldb/modules/rdn_name.c
+++ b/source4/lib/ldb/modules/rdn_name.c
@@ -48,7 +48,7 @@ struct rename_context {
 
 static struct ldb_message_element *rdn_name_find_attribute(const struct ldb_message *msg, const char *name)
 {
-	int i;
+	unsigned int i;
 
 	for (i = 0; i < msg->num_elements; i++) {
 		if (ldb_attr_cmp(name, msg->elements[i].name) == 0) {
@@ -94,7 +94,8 @@ static int rdn_name_add(struct ldb_module *module, struct ldb_request *req)
 	const struct ldb_schema_attribute *a;
 	const char *rdn_name;
 	struct ldb_val rdn_val;
-	int i, ret;
+	unsigned int i;
+	int ret;
 
 	ldb = ldb_module_get_ctx(module);
 
diff --git a/source4/lib/ldb/modules/sort.c b/source4/lib/ldb/modules/sort.c
index 4ef7a0c..f7c381f 100644
--- a/source4/lib/ldb/modules/sort.c
+++ b/source4/lib/ldb/modules/sort.c
@@ -51,8 +51,8 @@ struct sort_context {
 	struct ldb_request *req;
 	struct ldb_message **msgs;
 	char **referrals;
-	int num_msgs;
-	int num_refs;
+	unsigned int num_msgs;
+	unsigned int num_refs;
 
 	const struct ldb_schema_attribute *a;
 	int sort_result;
@@ -62,7 +62,7 @@ static int build_response(void *mem_ctx, struct ldb_control ***ctrls, int result
 {
 	struct ldb_control **controls;
 	struct ldb_sort_resp_control *resp;
-	int i;
+	unsigned int i;
 
 	if (*ctrls) {
 		controls = *ctrls;
@@ -137,7 +137,8 @@ static int server_sort_results(struct sort_context *ac)
 {
 	struct ldb_context *ldb;
 	struct ldb_reply *ares;
-	int i, ret;
+	unsigned int i;
+	int ret;
 
 	ldb = ldb_module_get_ctx(ac->module);
 


-- 
Samba Shared Repository


More information about the samba-cvs mailing list