From: Kurt Zeilenga <kurt@openldap.org>
Date: Sat, 13 May 2000 00:48:17 +0000 (+0000)
Subject: make ntservice error to string routines static
X-Git-Tag: LDBM_PRE_GIANT_RWLOCK~2986
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=69fbf137aa513b3234a4f7c163615e2aad050425;p=openldap

make ntservice error to string routines static
#undef __RETSTR before #define
---

diff --git a/libraries/liblber/nt_err.c b/libraries/liblber/nt_err.c
index ebcb3bb5f8..1f9bd2a2e9 100644
--- a/libraries/liblber/nt_err.c
+++ b/libraries/liblber/nt_err.c
@@ -7,6 +7,7 @@
 #include <winsock.h>
 #endif /* HAVE_WINSOCK(2) */
 
+#undef __RETSTR
 #define __RETSTR( x ) case x: return #x;
 
 char *ber_pvt_wsa_err2string( int err )
@@ -79,7 +80,5 @@ char *ber_pvt_wsa_err2string( int err )
 		__RETSTR( WSANO_RECOVERY )
 		__RETSTR( WSANO_DATA )
 	}
-	return "unknown";
-}
-
-#undef __RETSTR
+	return "unknown WSA error";
+}
\ No newline at end of file
diff --git a/libraries/liblutil/ntservice.c b/libraries/liblutil/ntservice.c
index 73acdd3754..e42f08bfa3 100644
--- a/libraries/liblutil/ntservice.c
+++ b/libraries/liblutil/ntservice.c
@@ -43,7 +43,7 @@ ldap_pvt_thread_t		start_status_tid,	stop_status_tid;
 
 void (*stopfunc)(int);
 
-char *GetLastErrorString( void );
+static char *GetLastErrorString( void );
 
 int srv_install(LPCTSTR lpszServiceName, LPCTSTR lpszDisplayName,
 		LPCTSTR lpszBinaryPathName, BOOL auto_start)
@@ -428,7 +428,7 @@ void ReportSlapdShutdownComplete(  )
 	}
 }
 
-char *GetErrorString( int err )
+static char *GetErrorString( int err )
 {
 	static char msgBuf[1024];
 
@@ -441,7 +441,7 @@ char *GetErrorString( int err )
 	return msgBuf;
 }
 
-char *GetLastErrorString( void )
+static char *GetLastErrorString( void )
 {
 	return GetErrorString( GetLastError() );
 }