diff options
| author | Ulf Möller <ulf@openssl.org> | 2000-03-10 17:01:23 +0000 |
|---|---|---|
| committer | Ulf Möller <ulf@openssl.org> | 2000-03-10 17:01:23 +0000 |
| commit | 153a59f46d24803f90d355be6689697e08266fd3 (patch) | |
| tree | 8c32d47ad930da9f8e0c52075fff24482ee40cc4 /crypto/bio/bss_log.c | |
| parent | 2d5e449a18ed4fb85633c358bfc37df0cc5abc3a (diff) | |
Repair bss_log.
Curiously enough, void functions don't return a value.
Diffstat (limited to 'crypto/bio/bss_log.c')
| -rw-r--r-- | crypto/bio/bss_log.c | 28 |
1 files changed, 13 insertions, 15 deletions
diff --git a/crypto/bio/bss_log.c b/crypto/bio/bss_log.c index 3c8e6dc0ac..8d08f86c27 100644 --- a/crypto/bio/bss_log.c +++ b/crypto/bio/bss_log.c @@ -67,19 +67,22 @@ #include <errno.h> #if defined(WIN32) -#include <process.h> +# include <process.h> +#elif defined (MSDOS) +# define NO_SYSLOG #elif defined(VMS) || defined(__VMS) -#include <opcdef.h> -#include <descrip.h> +# include <opcdef.h> +# include <descrip.h> #elif defined(__ultrix) -#include <sys/syslog.h> +# include <sys/syslog.h> #else -#include <syslog.h> +# include <syslog.h> #endif #include "cryptlib.h" #include <openssl/buffer.h> #include <openssl/err.h> + #ifndef NO_SYSLOG #if defined(WIN32) @@ -210,10 +213,7 @@ static int MS_CALLBACK slg_puts(BIO *bp, char *str) static void xopenlog(BIO* bp, const char* name, int level) { - if((bp->ptr= (char *)RegisterEventSource(NULL, name)) == NULL){ - return(0); - } - return(1); + bp->ptr= (char *)RegisterEventSource(NULL, name); } static void xsyslog(BIO *bp, int priority, const char *string) @@ -241,12 +241,11 @@ static void xsyslog(BIO *bp, int priority, const char *string) sprintf(pidbuf, "[%d] ", pid); lpszStrings[0] = pidbuf; - lpszStrings[1] = pp; + lpszStrings[1] = string; if(bp->ptr) ReportEvent(bp->ptr, evtype, 0, 1024, NULL, 2, 0, lpszStrings, NULL); - return 1; } static void xcloselog(BIO* bp) @@ -254,7 +253,6 @@ static void xcloselog(BIO* bp) if(bp->ptr) DeregisterEventSource((HANDLE)(bp->ptr)); bp->ptr= NULL; - return(1); } #elif defined(VMS) @@ -298,7 +296,7 @@ static void xcloselog(BIO* bp) { } -#else +#else /* Unix */ static void xopenlog(BIO* bp, const char* name, int level) { @@ -315,6 +313,6 @@ static void xcloselog(BIO* bp) closelog(); } -#endif +#endif /* Unix */ -#endif +#endif /* NO_SYSLOG */ |