3 files changed, 9 insertions, 8 deletions

diff --git a/source4/cluster/ctdb/common/ctdb_io.c b/source4/cluster/ctdb/common/ctdb_io.c
index 3cc522b58a..ca9c635878 100644
--- a/source4/cluster/ctdb/common/ctdb_io.c
+++ b/source4/cluster/ctdb/common/ctdb_io.c
@@ -73,8 +73,9 @@ static void queue_io_read(struct ctdb_queue *queue)
 	}
 
 
-	queue->partial.data = talloc_realloc_size(queue, queue->partial.data, 
-						  num_ready + queue->partial.length);
+	queue->partial.data = talloc_realloc(queue, queue->partial.data, 
+					     uint8_t, 
+					     num_ready + queue->partial.length);
 
 	if (queue->partial.data == NULL) {
 		DEBUG(0,("read error alloc failed for %u\n", 
@@ -114,7 +115,7 @@ static void queue_io_read(struct ctdb_queue *queue)
 			DEBUG(0,("Invalid packet of length 0\n"));
 			goto failed;
 		}
-		d2 = talloc_memdup(queue, data, len);
+		d2 = (uint8_t *)talloc_memdup(queue, data, len);
 		if (d2 == NULL) {
 			DEBUG(0,("read error memdup failed for %u\n", len));
 			/* sigh */
@@ -131,7 +132,7 @@ static void queue_io_read(struct ctdb_queue *queue)
 			queue->partial.data = data;
 			queue->partial.length = nread;
 		} else {
-			queue->partial.data = talloc_memdup(queue, data, nread);
+			queue->partial.data = (uint8_t *)talloc_memdup(queue, data, nread);
 			if (queue->partial.data == NULL) {
 				DEBUG(0,("read error memdup partial failed for %u\n", 
 					 (unsigned)nread));
@@ -265,7 +266,7 @@ int ctdb_queue_send(struct ctdb_queue *queue, uint8_t *data, uint32_t length)
 	pkt = talloc(queue, struct ctdb_queue_pkt);
 	CTDB_NO_MEMORY(queue->ctdb, pkt);
 
-	pkt->data = talloc_memdup(pkt, data, length2);
+	pkt->data = (uint8_t *)talloc_memdup(pkt, data, length2);
 	CTDB_NO_MEMORY(queue->ctdb, pkt->data);
 
 	pkt->length = length2;
diff --git a/source4/cluster/ctdb/common/ctdb_ltdb.c b/source4/cluster/ctdb/common/ctdb_ltdb.c
index 7db1523ca1..8d8b4fd24a 100644
--- a/source4/cluster/ctdb/common/ctdb_ltdb.c
+++ b/source4/cluster/ctdb/common/ctdb_ltdb.c
@@ -106,7 +106,7 @@ int ctdb_ltdb_fetch(struct ctdb_db_context *ctdb_db,
 
 	if (data) {
 		data->dsize = rec.dsize - sizeof(struct ctdb_ltdb_header);
-		data->dptr = talloc_memdup(mem_ctx, 
+		data->dptr = (unsigned char *)talloc_memdup(mem_ctx, 
 					   sizeof(struct ctdb_ltdb_header)+rec.dptr,
 					   data->dsize);
 	}
@@ -144,7 +144,7 @@ int ctdb_ltdb_store(struct ctdb_db_context *ctdb_db, TDB_DATA key,
 	}
 
 	rec.dsize = sizeof(*header) + data.dsize;
-	rec.dptr = talloc_size(ctdb, rec.dsize);
+	rec.dptr = (unsigned char *)talloc_size(ctdb, rec.dsize);
 	CTDB_NO_MEMORY(ctdb, rec.dptr);
 
 	memcpy(rec.dptr, header, sizeof(*header));
diff --git a/source4/cluster/ctdb/common/ctdb_util.c b/source4/cluster/ctdb/common/ctdb_util.c
index 54b1e4e7ff..f11388331d 100644
--- a/source4/cluster/ctdb/common/ctdb_util.c
+++ b/source4/cluster/ctdb/common/ctdb_util.c
@@ -51,7 +51,7 @@ void ctdb_set_error(struct ctdb_context *ctdb, const char *fmt, ...)
 /*
   a fatal internal error occurred - no hope for recovery
 */
-void ctdb_fatal(struct ctdb_context *ctdb, const char *msg)
+_NORETURN_ void ctdb_fatal(struct ctdb_context *ctdb, const char *msg)
 {
 	DEBUG(0,("ctdb fatal error: %s\n", msg));
 	abort();