From bcc232dcbcb800bc5d24ff668458dfa38e04d49d Mon Sep 17 00:00:00 2001
From: Steven Dake <sdake@redhat.com>
Date: Mon, 10 Jul 2006 22:18:32 +0000
Subject: [PATCH] Rename saConnectServiceTwo to saConnectService

git-svn-id: http://svn.fedorahosted.org/svn/corosync/trunk@1114 fd59a12c-fef9-0310-b244-a6a79926bd2f
---
 lib/amf.c  | 2 +-
 lib/cfg.c  | 2 +-
 lib/ckpt.c | 2 +-
 lib/clm.c  | 2 +-
 lib/cpg.c  | 2 +-
 lib/evs.c  | 2 +-
 lib/evt.c  | 2 +-
 lib/lck.c  | 6 +++---
 lib/util.c | 2 +-
 lib/util.h | 5 -----
 10 files changed, 11 insertions(+), 16 deletions(-)

diff --git a/lib/amf.c b/lib/amf.c
index d44ed131..f6535bd6 100644
--- a/lib/amf.c
+++ b/lib/amf.c
@@ -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;
diff --git a/lib/cfg.c b/lib/cfg.c
index f14abb8c..7d1fcc9a 100644
--- a/lib/cfg.c
+++ b/lib/cfg.c
@@ -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;
diff --git a/lib/ckpt.c b/lib/ckpt.c
index 1e9cebef..122b510a 100644
--- a/lib/ckpt.c
+++ b/lib/ckpt.c
@@ -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;
diff --git a/lib/clm.c b/lib/clm.c
index 4816763a..803b1bf5 100644
--- a/lib/clm.c
+++ b/lib/clm.c
@@ -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;
diff --git a/lib/cpg.c b/lib/cpg.c
index 7a889cca..b6c0a0f1 100644
--- a/lib/cpg.c
+++ b/lib/cpg.c
@@ -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) {
diff --git a/lib/evs.c b/lib/evs.c
index d3a18ad0..70052f07 100644
--- a/lib/evs.c
+++ b/lib/evs.c
@@ -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) {
diff --git a/lib/evt.c b/lib/evt.c
index 390fe1bb..77c2bd5b 100644
--- a/lib/evt.c
+++ b/lib/evt.c
@@ -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;
diff --git a/lib/lck.c b/lib/lck.c
index 63009abf..5bd0b131 100644
--- a/lib/lck.c
+++ b/lib/lck.c
@@ -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;
 	}
diff --git a/lib/util.c b/lib/util.c
index 9c3a30d7..e72a1997 100644
--- a/lib/util.c
+++ b/lib/util.c
@@ -90,7 +90,7 @@ void socket_nosigpipe(int s)
 #endif 
 
 SaAisErrorT
-saServiceConnectTwo (
+saServiceConnect (
 	int *responseOut,
 	int *callbackOut,
 	enum service_types service)
diff --git a/lib/util.h b/lib/util.h
index 07bc4b69..b73f80bd 100644
--- a/lib/util.h
+++ b/lib/util.h
@@ -84,11 +84,6 @@ struct queue {
 
 SaAisErrorT
 saServiceConnect (
-	int *fdOut,
-	enum service_types service);
-
-SaAisErrorT
-saServiceConnectTwo (
         int *responseOut,
         int *callbackOut,
         enum service_types service);