From 3e99facbd35ca3fe12e0c121223cfa67fecde248 Mon Sep 17 00:00:00 2001
From: Jeff Hill <johill@lanl.gov>
Date: Wed, 31 May 2000 22:56:36 +0000
Subject: [PATCH] changed the name of bsdSock{Attach,Release}

---
 src/libCom/fdmgr/fdManager.cpp      | 4 ++--
 src/libCom/osi/os/WIN32/dllmain.cpp | 4 ++--
 src/libCom/osi/os/WIN32/osdSock.c   | 8 ++++----
 src/libCom/osi/os/default/osdSock.c | 4 ++--
 src/libCom/osi/os/vxWorks/osdSock.c | 4 ++--
 src/libCom/osi/osiSock.h            | 4 ++--
 6 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/src/libCom/fdmgr/fdManager.cpp b/src/libCom/fdmgr/fdManager.cpp
index a38a6340f..203523434 100644
--- a/src/libCom/fdmgr/fdManager.cpp
+++ b/src/libCom/fdmgr/fdManager.cpp
@@ -98,7 +98,7 @@ epicsShareFunc fdManager::fdManager (osiTimerQueue &timerQueueIn) :
 	size_t i;
     int status;
 
-    status = bsdSockAttach();
+    status = osiSockAttach();
 	assert (status);
 
 	for (i=0u; i<sizeof(this->fdSets)/sizeof(this->fdSets[0u]); i++) {
@@ -124,7 +124,7 @@ epicsShareFunc fdManager::~fdManager()
 		pReg->state = fdReg::limbo;
 		pReg->destroy();
 	}
-	bsdSockRelease();
+	osiSockRelease();
 }
 
 //
diff --git a/src/libCom/osi/os/WIN32/dllmain.cpp b/src/libCom/osi/os/WIN32/dllmain.cpp
index 414e277c9..22ec9213f 100644
--- a/src/libCom/osi/os/WIN32/dllmain.cpp
+++ b/src/libCom/osi/os/WIN32/dllmain.cpp
@@ -55,7 +55,7 @@ BOOL WINAPI DllMain(HANDLE hModule, DWORD dwReason, LPVOID lpReserved)
 	switch (dwReason) 
 	{
 	case DLL_PROCESS_ATTACH:
-		if (!bsdSockAttach()) 
+		if ( ! osiSockAttach() ) 
 			return FALSE;
 #		ifdef _DEBUG
 			fprintf(stderr, "Process attached to Com.dll version %s\n", EPICS_VERSION_STRING);
@@ -63,7 +63,7 @@ BOOL WINAPI DllMain(HANDLE hModule, DWORD dwReason, LPVOID lpReserved)
 		break;
 
 	case DLL_PROCESS_DETACH:
-		bsdSockRelease();
+		osiSockRelease();
 #		ifdef _DEBUG
 			fprintf(stderr, "Process detached from Com.dll version %s\n", EPICS_VERSION_STRING);
 #		endif
diff --git a/src/libCom/osi/os/WIN32/osdSock.c b/src/libCom/osi/os/WIN32/osdSock.c
index c59668a2a..4092b25c9 100644
--- a/src/libCom/osi/os/WIN32/osdSock.c
+++ b/src/libCom/osi/os/WIN32/osdSock.c
@@ -60,9 +60,9 @@ epicsShareFunc unsigned epicsShareAPI wsaMajorVersion ()
 }
 	
 /*
- * bsdSockAttach()
+ * osiSockAttach()
  */
-epicsShareFunc int epicsShareAPI bsdSockAttach()
+epicsShareFunc int epicsShareAPI osiSockAttach()
 {
 	int status;
 
@@ -114,9 +114,9 @@ epicsShareFunc int epicsShareAPI bsdSockAttach()
 }
 
 /*
- * bsdSockRelease()
+ * osiSockRelease()
  */
-epicsShareFunc void epicsShareAPI bsdSockRelease()
+epicsShareFunc void epicsShareAPI osiSockRelease()
 {
 	if (nAttached) {
 		if (--nAttached==0u) {
diff --git a/src/libCom/osi/os/default/osdSock.c b/src/libCom/osi/os/default/osdSock.c
index 5308e1608..3b75849ae 100644
--- a/src/libCom/osi/os/default/osdSock.c
+++ b/src/libCom/osi/os/default/osdSock.c
@@ -65,7 +65,7 @@ static void unlockInfo (void)
 /*
  * NOOP
  */
-int bsdSockAttach()
+int osiSockAttach()
 {
 	return 1;
 }
@@ -73,7 +73,7 @@ int bsdSockAttach()
 /*
  * NOOP
  */
-void bsdSockRelease()
+void osiSockRelease()
 {
 }
 
diff --git a/src/libCom/osi/os/vxWorks/osdSock.c b/src/libCom/osi/os/vxWorks/osdSock.c
index 635a601b7..c88eee15c 100644
--- a/src/libCom/osi/os/vxWorks/osdSock.c
+++ b/src/libCom/osi/os/vxWorks/osdSock.c
@@ -12,12 +12,12 @@
 #define epicsExportSharedSymbols
 #include "osiSock.h"
 
-int bsdSockAttach()
+int osiSockAttach()
 {
 	return 1;
 }
 
-void bsdSockRelease()
+void osiSockRelease()
 {
 }
 
diff --git a/src/libCom/osi/osiSock.h b/src/libCom/osi/osiSock.h
index 17d1b8b7a..0fdc406b4 100644
--- a/src/libCom/osi/osiSock.h
+++ b/src/libCom/osi/osiSock.h
@@ -89,12 +89,12 @@ epicsShareFunc int epicsShareAPI hostToIPAddr
 /*
  * attach to BSD socket library
  */
-epicsShareFunc int epicsShareAPI bsdSockAttach(void); /* returns T if success, else F */
+epicsShareFunc int epicsShareAPI osiSockAttach (void); /* returns T if success, else F */
 
 /*
  * release BSD socket library
  */
-epicsShareFunc void epicsShareAPI bsdSockRelease(void);
+epicsShareFunc void epicsShareAPI osiSockRelease (void);
 
 /*
  * convert socket error number to a string