The branch, master has been updated
via d29e1880c8ce7219e065d31b47b0e8ad9e83146d (commit)
from a0a0f5588445aeabe07b0e4d65087db454dc09da (commit)
http://gitweb.samba.org/?p=ctdb.git;a=shortlog;h=master
- Log -----------------------------------------------------------------
commit d29e1880c8ce7219e065d31b47b0e8ad9e83146d
Author: Amitay Isaacs <[email protected]>
Date: Fri Jun 15 15:07:04 2012 +1000
Fix compiler warnings.
Signed-off-by: Amitay Isaacs <[email protected]>
-----------------------------------------------------------------------
Summary of changes:
libctdb/control.c | 2 +-
server/ctdb_takeover.c | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
Changeset truncated at 500 lines:
diff --git a/libctdb/control.c b/libctdb/control.c
index f927e08..e8a5cd7 100644
--- a/libctdb/control.c
+++ b/libctdb/control.c
@@ -137,7 +137,7 @@ bool ctdb_getdbstat_recv(struct ctdb_connection *ctdb,
return false;
}
- wire = reply->data;
+ wire = (struct ctdb_db_statistics_wire *)reply->data;
s = malloc(offsetof(struct ctdb_db_statistics, hot_keys) +
sizeof(struct ctdb_db_hot_key) * wire->num_hot_keys);
if (!s) {
diff --git a/server/ctdb_takeover.c b/server/ctdb_takeover.c
index cb6aa83..99d765e 100644
--- a/server/ctdb_takeover.c
+++ b/server/ctdb_takeover.c
@@ -3763,7 +3763,7 @@ static int ctdb_reloadips_child(struct ctdb_context *ctdb)
}
if (i == ips->num) {
struct ctdb_control_ip_iface pub;
- char *ifaces = NULL;
+ const char *ifaces = NULL;
int iface = 0;
DEBUG(DEBUG_NOTICE,("RELOADIPS: New ip:%s found, adding
it.\n", ctdb_addr_to_str(&vnn->public_address)));
--
CTDB repository
