mirror of
https://git.proxmox.com/git/mirror_corosync
synced 2025-05-02 12:06:33 +00:00
Rename saConnectServiceTwo to saConnectService
git-svn-id: http://svn.fedorahosted.org/svn/corosync/trunk@1114 fd59a12c-fef9-0310-b244-a6a79926bd2f
This commit is contained in:
parent
fbfe92f7da
commit
bcc232dcbc
@ -131,7 +131,7 @@ saAmfInitialize (
|
||||
|
||||
amfInstance->dispatch_fd = -1;
|
||||
|
||||
error = saServiceConnectTwo (&amfInstance->response_fd,
|
||||
error = saServiceConnect (&amfInstance->response_fd,
|
||||
&amfInstance->dispatch_fd, AMF_SERVICE);
|
||||
if (error != SA_AIS_OK) {
|
||||
goto error_put_destroy;
|
||||
|
@ -130,7 +130,7 @@ openaisCfgInitialize (
|
||||
|
||||
cfgInstance->dispatch_fd = -1;
|
||||
|
||||
error = saServiceConnectTwo (&cfgInstance->response_fd,
|
||||
error = saServiceConnect (&cfgInstance->response_fd,
|
||||
&cfgInstance->dispatch_fd, AMF_SERVICE);
|
||||
if (error != SA_OK) {
|
||||
goto error_put_destroy;
|
||||
|
@ -274,7 +274,7 @@ saCkptInitialize (
|
||||
|
||||
ckptInstance->response_fd = -1;
|
||||
|
||||
error = saServiceConnectTwo (&ckptInstance->response_fd,
|
||||
error = saServiceConnect (&ckptInstance->response_fd,
|
||||
&ckptInstance->dispatch_fd, CKPT_SERVICE);
|
||||
if (error != SA_AIS_OK) {
|
||||
goto error_put_destroy;
|
||||
|
@ -169,7 +169,7 @@ saClmInitialize (
|
||||
|
||||
clmInstance->dispatch_fd = -1;
|
||||
|
||||
error = saServiceConnectTwo (&clmInstance->response_fd,
|
||||
error = saServiceConnect (&clmInstance->response_fd,
|
||||
&clmInstance->dispatch_fd, CLM_SERVICE);
|
||||
if (error != SA_AIS_OK) {
|
||||
goto error_put_destroy;
|
||||
|
@ -101,7 +101,7 @@ cpg_error_t cpg_initialize (
|
||||
goto error_destroy;
|
||||
}
|
||||
|
||||
error = saServiceConnectTwo (&cpg_inst->dispatch_fd,
|
||||
error = saServiceConnect (&cpg_inst->dispatch_fd,
|
||||
&cpg_inst->response_fd,
|
||||
CPG_SERVICE);
|
||||
if (error != SA_AIS_OK) {
|
||||
|
@ -111,7 +111,7 @@ evs_error_t evs_initialize (
|
||||
goto error_destroy;
|
||||
}
|
||||
|
||||
error = saServiceConnectTwo (&evs_inst->response_fd,
|
||||
error = saServiceConnect (&evs_inst->response_fd,
|
||||
&evs_inst->dispatch_fd,
|
||||
EVS_SERVICE);
|
||||
if (error != SA_AIS_OK) {
|
||||
|
@ -383,7 +383,7 @@ saEvtInitialize(
|
||||
/*
|
||||
* Set up communication with the event server
|
||||
*/
|
||||
error = saServiceConnectTwo(&evti->ei_response_fd,
|
||||
error = saServiceConnect(&evti->ei_response_fd,
|
||||
&evti->ei_dispatch_fd, EVT_SERVICE);
|
||||
if (error != SA_AIS_OK) {
|
||||
goto error_handle_put;
|
||||
|
@ -260,7 +260,7 @@ saLckInitialize (
|
||||
|
||||
lckInstance->response_fd = -1;
|
||||
|
||||
error = saServiceConnectTwo (&lckInstance->response_fd,
|
||||
error = saServiceConnect (&lckInstance->response_fd,
|
||||
&lckInstance->dispatch_fd, LCK_SERVICE);
|
||||
if (error != SA_AIS_OK) {
|
||||
goto error_put_destroy;
|
||||
@ -850,7 +850,7 @@ saLckResourceLock (
|
||||
goto error_destroy;
|
||||
}
|
||||
|
||||
error = saServiceConnectTwo (&lock_fd, &dummy_fd, LCK_SERVICE);
|
||||
error = saServiceConnect (&lock_fd, &dummy_fd, LCK_SERVICE);
|
||||
if (error != SA_AIS_OK) { // TODO error handling
|
||||
goto error_destroy;
|
||||
}
|
||||
@ -943,7 +943,7 @@ saLckResourceLockAsync (
|
||||
goto error_destroy;
|
||||
}
|
||||
|
||||
error = saServiceConnectTwo (&lock_fd, &dummy_fd, LCK_SERVICE);
|
||||
error = saServiceConnect (&lock_fd, &dummy_fd, LCK_SERVICE);
|
||||
if (error != SA_AIS_OK) { // TODO error handling
|
||||
goto error_destroy;
|
||||
}
|
||||
|
@ -90,7 +90,7 @@ void socket_nosigpipe(int s)
|
||||
#endif
|
||||
|
||||
SaAisErrorT
|
||||
saServiceConnectTwo (
|
||||
saServiceConnect (
|
||||
int *responseOut,
|
||||
int *callbackOut,
|
||||
enum service_types service)
|
||||
|
@ -84,11 +84,6 @@ struct queue {
|
||||
|
||||
SaAisErrorT
|
||||
saServiceConnect (
|
||||
int *fdOut,
|
||||
enum service_types service);
|
||||
|
||||
SaAisErrorT
|
||||
saServiceConnectTwo (
|
||||
int *responseOut,
|
||||
int *callbackOut,
|
||||
enum service_types service);
|
||||
|
Loading…
Reference in New Issue
Block a user