[SCM] Samba Shared Repository - branch master updated

[Matthias Dieter Wallnöfer]

The branch, master has been updated
       via  ab0a881 ldb:ldb/common/ldb_modules.c - change the request counter type to be "unsigned"
       via  a15ebe6 ldb:ldb/common/ldb_modules.c - trivial - fix integer output specifiers
      from  9705dab s3:net rpc trust: fix two C++ implicit void * cast warnings

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


- Log -----------------------------------------------------------------
commit ab0a881bb4015d0b32f4f577f2bbd3ca72d31217
Author: Matthias Dieter Wallnöfer <mdw at samba.org>
Date:   Fri Apr 8 08:30:41 2011 +0200

    ldb:ldb/common/ldb_modules.c - change the request counter type to be "unsigned"
    
    Just for consistency since all other LDB counters are unsigned as well.
    
    And also the debug output specifier has been chosen to be "%u" - so it
    really should be unsigned.
    
    Autobuild-User: Matthias Dieter Wallnöfer <mdw at samba.org>
    Autobuild-Date: Fri Apr  8 09:17:47 CEST 2011 on sn-devel-104

commit a15ebe61c3a25c5097d1a320e3d8f47e4dba19f4
Author: Matthias Dieter Wallnöfer <mdw at samba.org>
Date:   Fri Apr 8 08:29:51 2011 +0200

    ldb:ldb/common/ldb_modules.c - trivial - fix integer output specifiers

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

Summary of changes:
 source4/lib/ldb/common/ldb_modules.c |    6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)


Changeset truncated at 500 lines:

diff --git a/source4/lib/ldb/common/ldb_modules.c b/source4/lib/ldb/common/ldb_modules.c
index 2e1aeb6..61d1901 100644
--- a/source4/lib/ldb/common/ldb_modules.c
+++ b/source4/lib/ldb/common/ldb_modules.c
@@ -402,7 +402,7 @@ int ldb_load_modules(struct ldb_context *ldb, const char *options[])
 			if (res->count == 0) {
 				ldb_debug(ldb, LDB_DEBUG_TRACE, "no modules required by the db");
 			} else if (res->count > 1) {
-				ldb_debug(ldb, LDB_DEBUG_FATAL, "Too many records found (%d), bailing out", res->count);
+				ldb_debug(ldb, LDB_DEBUG_FATAL, "Too many records found (%u), bailing out", res->count);
 				talloc_free(mem_ctx);
 				return LDB_ERR_OPERATIONS_ERROR;
 			} else {
@@ -783,7 +783,7 @@ int ldb_module_done(struct ldb_request *req,
 	if ((req->handle->ldb->flags & LDB_FLG_ENABLE_TRACING) &&
 	    req->handle->nesting == 0) {
 		ldb_debug_add(req->handle->ldb, "ldb_trace_response: DONE\n");
-		ldb_debug_add(req->handle->ldb, "error: %u\n", error);
+		ldb_debug_add(req->handle->ldb, "error: %d\n", error);
 		if (ldb_errstring(req->handle->ldb)) {
 			ldb_debug_add(req->handle->ldb, "msg: %s\n",
 				  ldb_errstring(req->handle->ldb));
@@ -1089,7 +1089,7 @@ int ldb_modules_load(const char *modules_path, const char *version)
 char *ldb_module_call_chain(struct ldb_request *req, TALLOC_CTX *mem_ctx)
 {
 	char *ret;
-	int i=0;
+	unsigned int i = 0;
 
 	ret = talloc_strdup(mem_ctx, "");
 	if (ret == NULL) {


-- 
Samba Shared Repository