ctdbd_conn: Make "cstatus" int32_t

This converts the "cstatus" parameter of ctdbd_control_local to what it is
defined as in the packet: int32_t. It was used inconsistently throughout the
code.

Signed-off-by: Volker Lendecke <vl@samba.org>
Reviewed-by: Ralph Boehme <slow@samba.org>
Autobuild-User(master): Ralph Böhme <slow@samba.org>
Autobuild-Date(master): Mon Apr 25 21:54:24 CEST 2016 on sn-devel-144

diff --git a/source3/include/ctdbd_conn.h b/source3/include/ctdbd_conn.h
index bf371e6af41d87d109fe773636fce772ed28a09e..c91f7008831860f0dd4cfb19ce60cfa76470d1bd 100644 (file)
--- a/source3/include/ctdbd_conn.h
+++ b/source3/include/ctdbd_conn.h
@@ -84,7 +84,7 @@ int ctdbd_register_ips(struct ctdbd_connection *conn,
 int ctdbd_control_local(struct ctdbd_connection *conn, uint32_t opcode,
                        uint64_t srvid, uint32_t flags, TDB_DATA data,
                        TALLOC_CTX *mem_ctx, TDB_DATA *outdata,
-                       int *cstatus);
+                       int32_t *cstatus);
 int ctdb_watch_us(struct ctdbd_connection *conn);
 int ctdb_unwatch(struct ctdbd_connection *conn);
 

diff --git a/source3/lib/ctdbd_conn.c b/source3/lib/ctdbd_conn.c
index c95af83ed3834846061f2a2dad84fe3bcae4e3a9..9ea029a9b1400ae57ce6c443f32b47debae3dff8 100644 (file)
--- a/source3/lib/ctdbd_conn.c
+++ b/source3/lib/ctdbd_conn.c
@@ -72,7 +72,7 @@ static int ctdbd_control(struct ctdbd_connection *conn,
                         uint64_t srvid, uint32_t flags,
                         TDB_DATA data,
                         TALLOC_CTX *mem_ctx, TDB_DATA *outdata,
-                        int *cstatus);
+                        int32_t *cstatus);
 
 /*
  * exit on fatal communications errors with the ctdbd daemon
@@ -112,7 +112,8 @@ int register_with_ctdbd(struct ctdbd_connection *conn, uint64_t srvid,
                        void *private_data)
 {
 
-       int ret, cstatus;
+       int ret;
+       int32_t cstatus;
        size_t num_callbacks;
        struct ctdbd_srvid_cb *tmp;
 
@@ -613,7 +614,7 @@ static int ctdbd_control(struct ctdbd_connection *conn,
                         uint64_t srvid, uint32_t flags,
                         TDB_DATA data,
                         TALLOC_CTX *mem_ctx, TDB_DATA *outdata,
-                        int *cstatus)
+                        int32_t *cstatus)
 {
        struct ctdb_req_control_old req;
        struct ctdb_req_header *hdr;
@@ -1028,7 +1029,7 @@ int ctdbd_traverse(struct ctdbd_connection *conn, uint32_t db_id,
        int ret;
        TDB_DATA key, data;
        struct ctdb_traverse_start t;
-       int cstatus;
+       int32_t cstatus;
 
        t.db_id = db_id;
        t.srvid = conn->rand_srvid;
@@ -1202,7 +1203,7 @@ int ctdbd_register_ips(struct ctdbd_connection *conn,
 int ctdbd_control_local(struct ctdbd_connection *conn, uint32_t opcode,
                        uint64_t srvid, uint32_t flags, TDB_DATA data,
                        TALLOC_CTX *mem_ctx, TDB_DATA *outdata,
-                       int *cstatus)
+                       int32_t *cstatus)
 {
        return ctdbd_control(conn, CTDB_CURRENT_NODE, opcode, srvid, flags, data,
                             mem_ctx, outdata, cstatus);
@@ -1213,7 +1214,7 @@ int ctdb_watch_us(struct ctdbd_connection *conn)
        struct ctdb_notify_data_old reg_data;
        size_t struct_len;
        int ret;
-       int cstatus;
+       int32_t cstatus;
 
        reg_data.srvid = CTDB_SRVID_SAMBA_NOTIFY;
        reg_data.len = 1;
@@ -1237,7 +1238,7 @@ int ctdb_unwatch(struct ctdbd_connection *conn)
 {
        uint64_t srvid = CTDB_SRVID_SAMBA_NOTIFY;
        int ret;
-       int cstatus;
+       int32_t cstatus;
 
        ret = ctdbd_control_local(
                conn, CTDB_CONTROL_DEREGISTER_NOTIFY, conn->rand_srvid, 0,

diff --git a/source3/lib/dbwrap/dbwrap_ctdb.c b/source3/lib/dbwrap/dbwrap_ctdb.c
index 59c0c783e419cca808460130c0e826a3537cb8be..1e4df09a21967e7a1fa58fe3bd19e5d2cd3f7d9d 100644 (file)
--- a/source3/lib/dbwrap/dbwrap_ctdb.c
+++ b/source3/lib/dbwrap/dbwrap_ctdb.c
@@ -700,7 +700,7 @@ static int db_ctdb_transaction_commit(struct db_context *db)
        struct db_ctdb_ctx *ctx = talloc_get_type_abort(db->private_data,
                                                        struct db_ctdb_ctx);
        NTSTATUS rets;
-       int status;
+       int32_t status;
        struct db_ctdb_transaction_handle *h = ctx->transaction;
        uint64_t old_seqnum, new_seqnum;
        int ret;
@@ -855,7 +855,7 @@ static NTSTATUS db_ctdb_send_schedule_for_deletion(struct db_record *rec)
        int ret;
        struct ctdb_control_schedule_for_deletion *dd;
        TDB_DATA indata;
-       int cstatus;
+       int32_t cstatus;
        struct db_ctdb_rec *crec = talloc_get_type_abort(
                rec->private_data, struct db_ctdb_rec);
 
@@ -884,7 +884,7 @@ static NTSTATUS db_ctdb_send_schedule_for_deletion(struct db_record *rec)
 
        if ((ret != 0) || cstatus != 0) {
                DEBUG(1, (__location__ " Error sending local control "
-                         "SCHEDULE_FOR_DELETION: %s, cstatus = %d\n",
+                         "SCHEDULE_FOR_DELETION: %s, cstatus = %"PRIi32"\n",
                          strerror(ret), cstatus));
                if (ret != 0) {
                        status = map_nt_error_from_unix(ret);
@@ -1580,7 +1580,7 @@ struct db_context *db_open_ctdb(TALLOC_CTX *mem_ctx,
        struct ctdbd_connection *conn;
        struct loadparm_context *lp_ctx;
        struct ctdb_db_priority prio;
-       int cstatus;
+       int32_t cstatus;
        int ret;
 
        if (!lp_clustering()) {
@@ -1643,8 +1643,8 @@ struct db_context *db_open_ctdb(TALLOC_CTX *mem_ctx,
                NULL, NULL, &cstatus);
 
        if ((ret != 0) || (cstatus != 0)) {
-               DEBUG(1, ("CTDB_CONTROL_SET_DB_PRIORITY failed: %s, %d\n",
-                         strerror(ret), cstatus));
+               DEBUG(1, ("CTDB_CONTROL_SET_DB_PRIORITY failed: %s, "
+                         "%"PRIi32"\n", strerror(ret), cstatus));
                TALLOC_FREE(result);
                return NULL;
        }
@@ -1662,7 +1662,7 @@ struct db_context *db_open_ctdb(TALLOC_CTX *mem_ctx,
                        NULL, NULL, &cstatus);
                if ((ret != 0) || (cstatus != 0)) {
                        DEBUG(1, ("CTDB_CONTROL_SET_DB_READONLY failed: "
-                                 "%s, %d\n", strerror(ret), cstatus));
+                                 "%s, %"PRIi32"\n", strerror(ret), cstatus));
                        TALLOC_FREE(result);
                        return NULL;
                }