generic-library/openssl
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Repair bss_log.

Browse Source 
Curiously enough, void functions don't return a value.
This commit is contained in:
Ulf Möller 2000-03-10 17:01:23 +00:00
parent 2d5e449a18
commit 153a59f46d
1 changed files with 13 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
crypto/bio/bss_log.c
View File

@ -67,19 +67,22 @@
#include <errno.h> #include <errno.h>
#if defined(WIN32) #if defined(WIN32)
#include <process.h> # include <process.h>
#elif defined (MSDOS)
# define NO_SYSLOG
#elif defined(VMS) || defined(__VMS) #elif defined(VMS) || defined(__VMS)
#include <opcdef.h> # include <opcdef.h>
#include <descrip.h> # include <descrip.h>
#elif defined(__ultrix) #elif defined(__ultrix)
#include <sys/syslog.h> # include <sys/syslog.h>
#else #else
#include <syslog.h> # include <syslog.h>
#endif #endif
#include "cryptlib.h" #include "cryptlib.h"
#include <openssl/buffer.h> #include <openssl/buffer.h>
#include <openssl/err.h> #include <openssl/err.h>
#ifndef NO_SYSLOG #ifndef NO_SYSLOG
#if defined(WIN32) #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) static void xopenlog(BIO* bp, const char* name, int level)
{ {
if((bp->ptr= (char *)RegisterEventSource(NULL, name)) == NULL){ bp->ptr= (char *)RegisterEventSource(NULL, name);
return(0);
}
return(1);
} }
static void xsyslog(BIO *bp, int priority, const char *string) 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); sprintf(pidbuf, "[%d] ", pid);
lpszStrings[0] = pidbuf; lpszStrings[0] = pidbuf;
lpszStrings[1] = pp; lpszStrings[1] = string;
if(bp->ptr) if(bp->ptr)
ReportEvent(bp->ptr, evtype, 0, 1024, NULL, 2, 0, ReportEvent(bp->ptr, evtype, 0, 1024, NULL, 2, 0,
lpszStrings, NULL); lpszStrings, NULL);
return 1;
} }
static void xcloselog(BIO* bp) static void xcloselog(BIO* bp)
@ -254,7 +253,6 @@ static void xcloselog(BIO* bp)
if(bp->ptr) if(bp->ptr)
DeregisterEventSource((HANDLE)(bp->ptr)); DeregisterEventSource((HANDLE)(bp->ptr));
bp->ptr= NULL; bp->ptr= NULL;
return(1);
} }
#elif defined(VMS) #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) static void xopenlog(BIO* bp, const char* name, int level)
{ {
@ -315,6 +313,6 @@ static void xcloselog(BIO* bp)
closelog(); closelog();
} }
#endif #endif /* Unix */
#endif #endif /* NO_SYSLOG */