diff options
| author | Jelmer Vernooij <jelmer@samba.org> | 2007-09-07 15:08:14 +0000 |
|---|---|---|
| committer | Gerald (Jerry) Carter <jerry@samba.org> | 2007-10-10 15:05:27 -0500 |
| commit | cd962355abad90a2161765a7be7d26e63572cab7 (patch) | |
| tree | 21a1e180cfa6396c491301e3e171d8105208bb44 /source4/cluster/ctdb/common | |
| parent | 6c79213eb80283bb211d2e2161c25337c0a549b7 (diff) | |
| download | samba-cd962355abad90a2161765a7be7d26e63572cab7.tar.gz samba-cd962355abad90a2161765a7be7d26e63572cab7.tar.bz2 samba-cd962355abad90a2161765a7be7d26e63572cab7.zip | |
r25000: Fix some more C++ compatibility warnings.
(This used to be commit 08bb1ef643ab906f1645cf6f32763dc73b1884e4)
Diffstat (limited to 'source4/cluster/ctdb/common')
| -rw-r--r-- | source4/cluster/ctdb/common/ctdb_io.c | 5 | ||||
| -rw-r--r-- | source4/cluster/ctdb/common/ctdb_util.c | 2 |
2 files changed, 4 insertions, 3 deletions
diff --git a/source4/cluster/ctdb/common/ctdb_io.c b/source4/cluster/ctdb/common/ctdb_io.c index 3cc522b58a..5c418e4956 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", 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(); |