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 ebcb3bb5f8425df7c683c35d2c8cfb0e3c06cb0f..1f9bd2a2e9399b867399f4096326f8c2f17c878c 100644 (file)
--- 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 73acdd37544d06a9e3eac216a942b795208a5378..e42f08bfa35d1ff16db2fcc615edf33a5433104a 100644 (file)
--- 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() );
 }