--- include/corosync/corotypes.h | 1 - lib/cfg.c | 30 +++++++++++++------------- lib/confdb.c | 47 ++++++++++++++++++++--------------------- lib/cpg.c | 12 +++++----- lib/pload.c | 2 +- lib/quorum.c | 10 ++++---- lib/votequorum.c | 2 +- 7 files changed, 51 insertions(+), 53 deletions(-)
diff --git a/include/corosync/corotypes.h b/include/corosync/corotypes.h index df747c7..ecdc749 100644 --- a/include/corosync/corotypes.h +++ b/include/corosync/corotypes.h @@ -133,7 +133,6 @@ static inline uint64_t cs_timestamp_get(void) return result; } -#define errno_to_cs qb_to_cs_error static inline cs_error_t qb_to_cs_error (int result) { int32_t res; diff --git a/lib/cfg.c b/lib/cfg.c index e5cf7e7..cdc9831 100644 --- a/lib/cfg.c +++ b/lib/cfg.c @@ -98,7 +98,7 @@ corosync_cfg_initialize ( cfg_inst->c = qb_ipcc_connect ("cfg", IPC_REQUEST_SIZE); if (cfg_inst->c == NULL) { - error = errno_to_cs(-errno); + error = qb_to_cs_error(-errno); goto error_put_destroy; } if (error != CS_OK) { @@ -134,7 +134,7 @@ corosync_cfg_fd_get ( return (error); } - error = errno_to_cs (qb_ipcc_fd_get (cfg_inst->c, selection_fd)); + error = qb_to_cs_error (qb_ipcc_fd_get (cfg_inst->c, selection_fd)); (void)hdb_handle_put (&cfg_hdb, cfg_handle); return (error); @@ -169,7 +169,7 @@ corosync_cfg_dispatch ( dispatch_data = (struct qb_ipc_response_header *)dispatch_buf; do { - error = errno_to_cs (qb_ipcc_event_recv ( + error = qb_to_cs_error (qb_ipcc_event_recv ( cfg_inst->c, dispatch_buf, IPC_DISPATCH_SIZE, @@ -285,7 +285,7 @@ corosync_cfg_ring_status_get ( iov.iov_base = (void *)&req_lib_cfg_ringstatusget, iov.iov_len = sizeof (struct req_lib_cfg_ringstatusget), - error = errno_to_cs (qb_ipcc_sendv_recv(cfg_inst->c, + error = qb_to_cs_error (qb_ipcc_sendv_recv(cfg_inst->c, &iov, 1, &res_lib_cfg_ringstatusget, @@ -365,7 +365,7 @@ corosync_cfg_ring_reenable ( iov.iov_base = (void *)&req_lib_cfg_ringreenable, iov.iov_len = sizeof (struct req_lib_cfg_ringreenable); - error = errno_to_cs (qb_ipcc_sendv_recv (cfg_inst->c, + error = qb_to_cs_error (qb_ipcc_sendv_recv (cfg_inst->c, &iov, 1, &res_lib_cfg_ringreenable, @@ -404,7 +404,7 @@ corosync_cfg_service_load ( iov.iov_base = (void *)&req_lib_cfg_serviceload; iov.iov_len = sizeof (req_lib_cfg_serviceload); - error = errno_to_cs (qb_ipcc_sendv_recv (cfg_inst->c, + error = qb_to_cs_error (qb_ipcc_sendv_recv (cfg_inst->c, &iov, 1, &res_lib_cfg_serviceload, @@ -443,7 +443,7 @@ corosync_cfg_service_unload ( iov.iov_base = (void *)&req_lib_cfg_serviceunload; iov.iov_len = sizeof (req_lib_cfg_serviceunload); - error = errno_to_cs (qb_ipcc_sendv_recv (cfg_inst->c, + error = qb_to_cs_error (qb_ipcc_sendv_recv (cfg_inst->c, &iov, 1, &res_lib_cfg_serviceunload, @@ -479,7 +479,7 @@ corosync_cfg_state_track ( iov.iov_base = (void *)&req_lib_cfg_statetrack, iov.iov_len = sizeof (struct req_lib_cfg_statetrack), - error = errno_to_cs (qb_ipcc_sendv_recv (cfg_inst->c, + error = qb_to_cs_error (qb_ipcc_sendv_recv (cfg_inst->c, &iov, 1, &res_lib_cfg_statetrack, @@ -512,7 +512,7 @@ corosync_cfg_state_track_stop ( iov.iov_base = (void *)&req_lib_cfg_statetrackstop, iov.iov_len = sizeof (struct req_lib_cfg_statetrackstop), - error = errno_to_cs (qb_ipcc_sendv_recv (cfg_inst->c, + error = qb_to_cs_error (qb_ipcc_sendv_recv (cfg_inst->c, &iov, 1, &res_lib_cfg_statetrackstop, @@ -553,7 +553,7 @@ corosync_cfg_kill_node ( iov.iov_base = (void *)&req_lib_cfg_killnode; iov.iov_len = sizeof (struct req_lib_cfg_killnode); - error = errno_to_cs (qb_ipcc_sendv_recv (cfg_inst->c, + error = qb_to_cs_error (qb_ipcc_sendv_recv (cfg_inst->c, &iov, 1, &res_lib_cfg_killnode, @@ -590,7 +590,7 @@ corosync_cfg_try_shutdown ( iov.iov_base = (void *)&req_lib_cfg_tryshutdown; iov.iov_len = sizeof (req_lib_cfg_tryshutdown); - error = errno_to_cs (qb_ipcc_sendv_recv (cfg_inst->c, + error = qb_to_cs_error (qb_ipcc_sendv_recv (cfg_inst->c, &iov, 1, &res_lib_cfg_tryshutdown, @@ -625,7 +625,7 @@ corosync_cfg_replyto_shutdown ( iov.iov_base = (void *)&req_lib_cfg_replytoshutdown; iov.iov_len = sizeof (struct req_lib_cfg_replytoshutdown); - error = errno_to_cs (qb_ipcc_sendv_recv (cfg_inst->c, + error = qb_to_cs_error (qb_ipcc_sendv_recv (cfg_inst->c, &iov, 1, &res_lib_cfg_replytoshutdown, @@ -663,7 +663,7 @@ cs_error_t corosync_cfg_get_node_addrs ( iov.iov_base = (char *)&req_lib_cfg_get_node_addrs; iov.iov_len = sizeof (req_lib_cfg_get_node_addrs); - error = errno_to_cs (qb_ipcc_sendv_recv ( + error = qb_to_cs_error (qb_ipcc_sendv_recv ( cfg_inst->c, &iov, 1, @@ -727,7 +727,7 @@ cs_error_t corosync_cfg_local_get ( iov.iov_base = (void *)&req_lib_cfg_local_get; iov.iov_len = sizeof (struct req_lib_cfg_local_get); - error = errno_to_cs (qb_ipcc_sendv_recv ( + error = qb_to_cs_error (qb_ipcc_sendv_recv ( cfg_inst->c, &iov, 1, @@ -772,7 +772,7 @@ corosync_cfg_crypto_set ( iov.iov_base = (void *)&req_lib_cfg_crypto_set; iov.iov_len = sizeof (struct req_lib_cfg_crypto_set); - error = errno_to_cs (qb_ipcc_sendv_recv (cfg_inst->c, + error = qb_to_cs_error (qb_ipcc_sendv_recv (cfg_inst->c, &iov, 1, &res_lib_cfg_crypto_set, diff --git a/lib/confdb.c b/lib/confdb.c index b2b79d8..ffa1876 100644 --- a/lib/confdb.c +++ b/lib/confdb.c @@ -222,7 +222,7 @@ cs_error_t confdb_fd_get ( return (error); } - error = errno_to_cs (qb_ipcc_fd_get (confdb_inst->c, fd)); + error = qb_to_cs_error (qb_ipcc_fd_get (confdb_inst->c, fd)); (void)hdb_handle_put (&confdb_handle_t_db, handle); @@ -304,12 +304,11 @@ cs_error_t confdb_dispatch ( dispatch_data = (struct qb_ipc_response_header *)dispatch_buf; do { - errno_res = qb_ipcc_event_recv ( + error = qb_to_cs_error(qb_ipcc_event_recv ( confdb_inst->c, dispatch_buf, IPC_DISPATCH_SIZE, - timeout); - error = errno_to_cs (errno_res); + timeout)); if (error == CS_ERR_BAD_HANDLE) { error = CS_OK; goto error_put; @@ -453,7 +452,7 @@ cs_error_t confdb_object_create ( iov.iov_base = (char *)&req_lib_confdb_object_create; iov.iov_len = sizeof (struct req_lib_confdb_object_create); - error = errno_to_cs (qb_ipcc_sendv_recv ( + error = qb_to_cs_error (qb_ipcc_sendv_recv ( confdb_inst->c, &iov, 1, @@ -503,7 +502,7 @@ cs_error_t confdb_object_destroy ( iov.iov_base = (char *)&req_lib_confdb_object_destroy; iov.iov_len = sizeof (struct req_lib_confdb_object_destroy); - error = errno_to_cs (qb_ipcc_sendv_recv ( + error = qb_to_cs_error (qb_ipcc_sendv_recv ( confdb_inst->c, &iov, 1, @@ -553,7 +552,7 @@ cs_error_t confdb_object_parent_get ( iov.iov_base = (char *)&req_lib_confdb_object_parent_get; iov.iov_len = sizeof (struct req_lib_confdb_object_parent_get); - error = errno_to_cs (qb_ipcc_sendv_recv ( + error = qb_to_cs_error (qb_ipcc_sendv_recv ( confdb_inst->c, &iov, 1, @@ -600,7 +599,7 @@ static cs_error_t do_find_destroy( iov.iov_base = (char *)&req_lib_confdb_object_find_destroy; iov.iov_len = sizeof (struct req_lib_confdb_object_find_destroy); - error = errno_to_cs (qb_ipcc_sendv_recv ( + error = qb_to_cs_error (qb_ipcc_sendv_recv ( confdb_inst->c, &iov, 1, @@ -707,7 +706,7 @@ cs_error_t confdb_key_create ( iov.iov_base = (char *)&req_lib_confdb_key_create; iov.iov_len = sizeof (struct req_lib_confdb_key_create); - error = errno_to_cs (qb_ipcc_sendv_recv ( + error = qb_to_cs_error (qb_ipcc_sendv_recv ( confdb_inst->c, &iov, 1, @@ -767,7 +766,7 @@ cs_error_t confdb_key_create_typed ( iov.iov_base = (char *)&request; iov.iov_len = sizeof (struct req_lib_confdb_key_create_typed); - error = errno_to_cs (qb_ipcc_sendv_recv ( + error = qb_to_cs_error (qb_ipcc_sendv_recv ( confdb_inst->c, &iov, 1, @@ -828,7 +827,7 @@ cs_error_t confdb_key_delete ( iov.iov_base = (char *)&req_lib_confdb_key_delete; iov.iov_len = sizeof (struct req_lib_confdb_key_delete); - error = errno_to_cs (qb_ipcc_sendv_recv ( + error = qb_to_cs_error (qb_ipcc_sendv_recv ( confdb_inst->c, &iov, 1, @@ -885,7 +884,7 @@ cs_error_t confdb_key_get ( iov.iov_base = (char *)&req_lib_confdb_key_get; iov.iov_len = sizeof (struct req_lib_confdb_key_get); - error = errno_to_cs (qb_ipcc_sendv_recv ( + error = qb_to_cs_error (qb_ipcc_sendv_recv ( confdb_inst->c, &iov, 1, @@ -946,7 +945,7 @@ cs_error_t confdb_key_get_typed ( iov.iov_base = (char *)&req_lib_confdb_key_get; iov.iov_len = sizeof (struct req_lib_confdb_key_get); - error = errno_to_cs (qb_ipcc_sendv_recv ( + error = qb_to_cs_error (qb_ipcc_sendv_recv ( confdb_inst->c, &iov, 1, @@ -1008,7 +1007,7 @@ cs_error_t confdb_key_increment ( iov.iov_base = (char *)&req_lib_confdb_key_get; iov.iov_len = sizeof (struct req_lib_confdb_key_get); - error = errno_to_cs (qb_ipcc_sendv_recv ( + error = qb_to_cs_error (qb_ipcc_sendv_recv ( confdb_inst->c, &iov, 1, @@ -1067,7 +1066,7 @@ cs_error_t confdb_key_decrement ( iov.iov_base = (char *)&req_lib_confdb_key_get; iov.iov_len = sizeof (struct req_lib_confdb_key_get); - error = errno_to_cs (qb_ipcc_sendv_recv ( + error = qb_to_cs_error (qb_ipcc_sendv_recv ( confdb_inst->c, &iov, 1, @@ -1133,7 +1132,7 @@ cs_error_t confdb_key_replace ( iov.iov_base = (char *)&req_lib_confdb_key_replace; iov.iov_len = sizeof (struct req_lib_confdb_key_replace); - error = errno_to_cs (qb_ipcc_sendv_recv ( + error = qb_to_cs_error (qb_ipcc_sendv_recv ( confdb_inst->c, &iov, 1, @@ -1305,7 +1304,7 @@ cs_error_t confdb_object_find ( iov.iov_base = (char *)&req_lib_confdb_object_find; iov.iov_len = sizeof (struct req_lib_confdb_object_find); - error = errno_to_cs (qb_ipcc_sendv_recv ( + error = qb_to_cs_error (qb_ipcc_sendv_recv ( confdb_inst->c, &iov, 1, @@ -1374,7 +1373,7 @@ cs_error_t confdb_object_iter ( iov.iov_base = (char *)&req_lib_confdb_object_iter; iov.iov_len = sizeof (struct req_lib_confdb_object_iter); - error = errno_to_cs (qb_ipcc_sendv_recv ( + error = qb_to_cs_error (qb_ipcc_sendv_recv ( confdb_inst->c, &iov, 1, @@ -1446,7 +1445,7 @@ cs_error_t confdb_key_iter ( iov.iov_base = (char *)&req_lib_confdb_key_iter; iov.iov_len = sizeof (struct req_lib_confdb_key_iter); - error = errno_to_cs (qb_ipcc_sendv_recv ( + error = qb_to_cs_error (qb_ipcc_sendv_recv ( confdb_inst->c, &iov, 1, @@ -1522,7 +1521,7 @@ cs_error_t confdb_key_iter_typed ( iov.iov_base = (char *)&req_lib_confdb_key_iter; iov.iov_len = sizeof (struct req_lib_confdb_key_iter); - error = errno_to_cs (qb_ipcc_sendv_recv ( + error = qb_to_cs_error (qb_ipcc_sendv_recv ( confdb_inst->c, &iov, 1, @@ -1582,7 +1581,7 @@ cs_error_t confdb_write ( iov.iov_base = (char *)&req; iov.iov_len = sizeof (struct qb_ipc_request_header); - error = errno_to_cs (qb_ipcc_sendv_recv ( + error = qb_to_cs_error (qb_ipcc_sendv_recv ( confdb_inst->c, &iov, 1, @@ -1640,7 +1639,7 @@ cs_error_t confdb_reload ( iov.iov_base = (char *)&req_lib_confdb_reload; iov.iov_len = sizeof (req_lib_confdb_reload); - error = errno_to_cs (qb_ipcc_sendv_recv ( + error = qb_to_cs_error (qb_ipcc_sendv_recv ( confdb_inst->c, &iov, 1, @@ -1694,7 +1693,7 @@ cs_error_t confdb_track_changes ( iov.iov_base = (char *)&req; iov.iov_len = sizeof (struct req_lib_confdb_object_track_start); - error = errno_to_cs (qb_ipcc_sendv_recv ( + error = qb_to_cs_error (qb_ipcc_sendv_recv ( confdb_inst->c, &iov, 1, @@ -1737,7 +1736,7 @@ cs_error_t confdb_stop_track_changes (confdb_handle_t handle) iov.iov_base = (char *)&req; iov.iov_len = sizeof (struct qb_ipc_request_header); - error = errno_to_cs (qb_ipcc_sendv_recv ( + error = qb_to_cs_error (qb_ipcc_sendv_recv ( confdb_inst->c, &iov, 1, diff --git a/lib/cpg.c b/lib/cpg.c index 4c84163..9a463d4 100644 --- a/lib/cpg.c +++ b/lib/cpg.c @@ -173,7 +173,7 @@ cs_error_t cpg_model_initialize ( cpg_inst->c = qb_ipcc_connect ("cpg", IPC_REQUEST_SIZE); if (cpg_inst->c == NULL) { - error = errno_to_cs(-errno); + error = qb_to_cs_error(-errno); goto error_put_destroy; } @@ -279,7 +279,7 @@ cs_error_t cpg_fd_get ( return (error); } - error = errno_to_cs (qb_ipcc_fd_get (cpg_inst->c, fd)); + error = qb_to_cs_error (qb_ipcc_fd_get (cpg_inst->c, fd)); hdb_handle_put (&cpg_handle_t_db, handle); @@ -369,7 +369,7 @@ cs_error_t cpg_dispatch ( dispatch_buf, IPC_DISPATCH_SIZE, timeout); - error = errno_to_cs (errno_res); + error = qb_to_cs_error (errno_res); if (error == CS_ERR_BAD_HANDLE) { error = CS_OK; goto error_put; @@ -953,7 +953,7 @@ cs_error_t cpg_mcast_joined ( iov[0].iov_len = sizeof (struct req_lib_cpg_mcast); memcpy (&iov[1], iovec, iov_len * sizeof (struct iovec)); - error = errno_to_cs(qb_ipcc_sendv(cpg_inst->c, iov, iov_len + 1)); + error = qb_to_cs_error(qb_ipcc_sendv(cpg_inst->c, iov, iov_len + 1)); hdb_handle_put (&cpg_handle_t_db, handle); @@ -1073,14 +1073,14 @@ cs_error_t cpg_iteration_next( req_lib_cpg_iterationnext.header.id = MESSAGE_REQ_CPG_ITERATIONNEXT; req_lib_cpg_iterationnext.iteration_handle = cpg_iteration_instance->executive_iteration_handle; - error = errno_to_cs (qb_ipcc_send (cpg_iteration_instance->conn, + error = qb_to_cs_error (qb_ipcc_send (cpg_iteration_instance->conn, &req_lib_cpg_iterationnext, req_lib_cpg_iterationnext.header.size)); if (error != CS_OK) { goto error_put; } - error = errno_to_cs (qb_ipcc_recv (cpg_iteration_instance->conn, + error = qb_to_cs_error (qb_ipcc_recv (cpg_iteration_instance->conn, &res_lib_cpg_iterationnext, sizeof(struct res_lib_cpg_iterationnext))); if (error != CS_OK) { diff --git a/lib/pload.c b/lib/pload.c index e874ad2..89fab10 100644 --- a/lib/pload.c +++ b/lib/pload.c @@ -90,7 +90,7 @@ unsigned int pload_initialize ( pload_inst->c = qb_ipcc_connect ("pload", IPC_REQUEST_SIZE); if (pload_inst->c == NULL) { - error = errno_to_cs(-errno); + error = qb_to_cs_error(-errno); goto error_put_destroy; } diff --git a/lib/quorum.c b/lib/quorum.c index a030e1c..5daaf5d 100644 --- a/lib/quorum.c +++ b/lib/quorum.c @@ -83,7 +83,7 @@ cs_error_t quorum_initialize ( error = CS_OK; quorum_inst->c = qb_ipcc_connect ("quorum", IPC_REQUEST_SIZE); if (quorum_inst->c == NULL) { - error = errno_to_cs(-errno); + error = qb_to_cs_error(-errno); goto error_put_destroy; } @@ -155,7 +155,7 @@ cs_error_t quorum_getquorate ( iov.iov_base = (char *)&req; iov.iov_len = sizeof (req); - error = errno_to_cs(qb_ipcc_sendv_recv ( + error = qb_to_cs_error(qb_ipcc_sendv_recv ( quorum_inst->c, &iov, 1, @@ -257,7 +257,7 @@ cs_error_t quorum_trackstart ( iov.iov_base = (char *)&req_lib_quorum_trackstart; iov.iov_len = sizeof (struct req_lib_quorum_trackstart); - error = errno_to_cs(qb_ipcc_sendv_recv ( + error = qb_to_cs_error(qb_ipcc_sendv_recv ( quorum_inst->c, &iov, 1, @@ -296,7 +296,7 @@ cs_error_t quorum_trackstop ( iov.iov_base = (char *)&req; iov.iov_len = sizeof (req); - error = errno_to_cs(qb_ipcc_sendv_recv ( + error = qb_to_cs_error(qb_ipcc_sendv_recv ( quorum_inst->c, &iov, 1, @@ -351,7 +351,7 @@ cs_error_t quorum_dispatch ( dispatch_data = (struct qb_ipc_response_header *)dispatch_buf; do { - error = errno_to_cs (qb_ipcc_event_recv ( + error = qb_to_cs_error (qb_ipcc_event_recv ( quorum_inst->c, dispatch_buf, IPC_DISPATCH_SIZE, diff --git a/lib/votequorum.c b/lib/votequorum.c index 505703d..cb4455e 100644 --- a/lib/votequorum.c +++ b/lib/votequorum.c @@ -708,7 +708,7 @@ cs_error_t votequorum_dispatch ( dispatch_data = (struct qb_ipc_response_header *)dispatch_buf; do { - error = errno_to_cs (qb_ipcc_event_recv ( + error = qb_to_cs_error (qb_ipcc_event_recv ( votequorum_inst->c, dispatch_buf, IPC_DISPATCH_SIZE, -- 1.7.3.1 _______________________________________________ Openais mailing list Openais@lists.linux-foundation.org https://lists.linux-foundation.org/mailman/listinfo/openais