diff options
| author | Amitay Isaacs <amitay@gmail.com> | 2012-06-15 15:07:04 +1000 |
|---|---|---|
| committer | Amitay Isaacs <amitay@gmail.com> | 2012-07-13 14:50:56 +1000 |
| commit | e379fc3ea58c95bc1c1e2dd18758cb00f59d8e12 (patch) | |
| tree | c8f24f6cffb015103b5b3efab1e48333085a6d4e | |
| parent | 27ce9dc366614f04f030831c81fe308dd4285c58 (diff) | |
| download | samba-e379fc3ea58c95bc1c1e2dd18758cb00f59d8e12.tar.gz samba-e379fc3ea58c95bc1c1e2dd18758cb00f59d8e12.tar.xz samba-e379fc3ea58c95bc1c1e2dd18758cb00f59d8e12.zip | |
Fix compiler warnings.
Signed-off-by: Amitay Isaacs <amitay@gmail.com>
(This used to be ctdb commit d29e1880c8ce7219e065d31b47b0e8ad9e83146d)
| -rw-r--r-- | ctdb/libctdb/control.c | 2 | ||||
| -rw-r--r-- | ctdb/server/ctdb_takeover.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/ctdb/libctdb/control.c b/ctdb/libctdb/control.c index f927e0866a..e8a5cd71ea 100644 --- a/ctdb/libctdb/control.c +++ b/ctdb/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/ctdb/server/ctdb_takeover.c b/ctdb/server/ctdb_takeover.c index cb6aa8322a..99d765eaf3 100644 --- a/ctdb/server/ctdb_takeover.c +++ b/ctdb/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))); |