[SCM] CTDB repository - branch master updated - 015cd221c3c62eaa3cd0351fb8e93292c7c293aa

[Andrew Tridgell]

The branch, master has been updated
       via  015cd221c3c62eaa3cd0351fb8e93292c7c293aa (commit)
       via  07c9133aedecaee3607ad3b6fa94e5c56417a9de (commit)
      from  6d21fd57bedffce2298ce7fe4c7d889c858ba7fa (commit)

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


- Log -----------------------------------------------------------------
commit 015cd221c3c62eaa3cd0351fb8e93292c7c293aa
Author: Andrew Tridgell <tridge at samba.org>
Date:   Fri Jul 4 17:04:37 2008 +1000

    fixed a warning

commit 07c9133aedecaee3607ad3b6fa94e5c56417a9de
Author: Andrew Tridgell <tridge at samba.org>
Date:   Fri Jul 4 17:04:26 2008 +1000

    fixed some incorrect CTDB_NO_MEMORY*() calls found after fixing the
    _VOID varient

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

Summary of changes:
 client/ctdb_client.c   |    7 ++++---
 server/ctdb_freeze.c   |    2 +-
 server/ctdb_recover.c  |    2 +-
 server/ctdb_takeover.c |    4 +++-
 4 files changed, 9 insertions(+), 6 deletions(-)


Changeset truncated at 500 lines:

diff --git a/client/ctdb_client.c b/client/ctdb_client.c
index 2158d48..f342553 100644
--- a/client/ctdb_client.c
+++ b/client/ctdb_client.c
@@ -25,6 +25,7 @@
 #include "lib/events/events.h"
 #include "system/network.h"
 #include "system/filesys.h"
+#include "system/locale.h"
 #include "../include/ctdb_private.h"
 #include "lib/util/dlinklist.h"
 
@@ -1306,7 +1307,7 @@ int ctdb_ctrl_setvnnmap(struct ctdb_context *ctdb, struct timeval timeout, uint3
 
 	len = offsetof(struct ctdb_vnn_map_wire, map) + sizeof(uint32_t)*vnnmap->size;
 	map = talloc_size(mem_ctx, len);
-	CTDB_NO_MEMORY_VOID(ctdb, map);
+	CTDB_NO_MEMORY(ctdb, map);
 
 	map->generation = vnnmap->generation;
 	map->size = vnnmap->size;
@@ -1846,7 +1847,7 @@ static int dumpdb_fn(struct ctdb_context *ctdb, TDB_DATA key, TDB_DATA data, voi
 	fprintf(f, "dmaster: %u\n", h->dmaster);
 	fprintf(f, "rsn: %llu\n", (unsigned long long)h->rsn);
 
-	fprintf(f, "key(%d) = \"", key.dsize);
+	fprintf(f, "key(%u) = \"", (unsigned)key.dsize);
 	for (i=0;i<key.dsize;i++) {
 		if (isascii(key.dptr[i])) {
 			fprintf(f, "%c", key.dptr[i]);
@@ -1856,7 +1857,7 @@ static int dumpdb_fn(struct ctdb_context *ctdb, TDB_DATA key, TDB_DATA data, voi
 	}
 	fprintf(f, "\"\n");
 
-	fprintf(f, "data(%d) = \"", data.dsize);
+	fprintf(f, "data(%u) = \"", (unsigned)data.dsize);
 	for (i=sizeof(*h);i<data.dsize;i++) {
 		if (isascii(data.dptr[i])) {
 			fprintf(f, "%c", data.dptr[i]);
diff --git a/server/ctdb_freeze.c b/server/ctdb_freeze.c
index b0fd519..4e365e1 100644
--- a/server/ctdb_freeze.c
+++ b/server/ctdb_freeze.c
@@ -125,7 +125,7 @@ static struct ctdb_freeze_handle *ctdb_freeze_lock(struct ctdb_context *ctdb)
 	struct fd_event *fde;
 
 	h = talloc_zero(ctdb, struct ctdb_freeze_handle);
-	CTDB_NO_MEMORY_VOID(ctdb, h);
+	CTDB_NO_MEMORY_NULL(ctdb, h);
 
 	h->ctdb = ctdb;
 
diff --git a/server/ctdb_recover.c b/server/ctdb_recover.c
index f71f7e9..29673ea 100644
--- a/server/ctdb_recover.c
+++ b/server/ctdb_recover.c
@@ -74,7 +74,7 @@ ctdb_control_getvnnmap(struct ctdb_context *ctdb, uint32_t opcode, TDB_DATA inda
 
 	len = offsetof(struct ctdb_vnn_map_wire, map) + sizeof(uint32_t)*ctdb->vnn_map->size;
 	map = talloc_size(outdata, len);
-	CTDB_NO_MEMORY_VOID(ctdb, map);
+	CTDB_NO_MEMORY(ctdb, map);
 
 	map->generation = ctdb->vnn_map->generation;
 	map->size = ctdb->vnn_map->size;
diff --git a/server/ctdb_takeover.c b/server/ctdb_takeover.c
index c4b6c82..10369d4 100644
--- a/server/ctdb_takeover.c
+++ b/server/ctdb_takeover.c
@@ -1775,7 +1775,9 @@ int32_t ctdb_control_send_gratious_arp(struct ctdb_context *ctdb, TDB_DATA indat
 
 	/* verify the size of indata */
 	if (indata.dsize < offsetof(struct ctdb_control_gratious_arp, iface)) {
-		DEBUG(DEBUG_ERR,(__location__ " Too small indata to hold a ctdb_control_gratious_arp structure. Got %u require %u bytes\n", indata.dsize, offsetof(struct ctdb_control_gratious_arp, iface)));
+		DEBUG(DEBUG_ERR,(__location__ " Too small indata to hold a ctdb_control_gratious_arp structure. Got %u require %u bytes\n", 
+				 (unsigned)indata.dsize, 
+				 (unsigned)offsetof(struct ctdb_control_gratious_arp, iface)));
 		return -1;
 	}
 	if (indata.dsize != 


-- 
CTDB repository