The host parameter to connect_to() is now const.

[privoxy.git] / errlog.c

diff --git a/errlog.c b/errlog.c
index 1c4aee4..ae98ed3 100644 (file)
--- a/errlog.c
+++ b/errlog.c
@@ -1,4 +1,4 @@
-const char errlog_rcs[] = "$Id: errlog.c,v 1.8 2001/05/26 17:25:14 jongfoster Exp $";
+const char errlog_rcs[] = "$Id: errlog.c,v 1.10 2001/05/29 11:52:21 oes Exp $";

 /*********************************************************************
  *
  * File        :  $Source: /cvsroot/ijbswa/current/errlog.c,v $
 /*********************************************************************
  *
  * File        :  $Source: /cvsroot/ijbswa/current/errlog.c,v $


@@ -33,6 +33,12 @@ const char errlog_rcs[] = "$Id: errlog.c,v 1.8 2001/05/26 17:25:14 jongfoster Ex
  *
  * Revisions   :
  *    $Log: errlog.c,v $
  *
  * Revisions   :
  *    $Log: errlog.c,v $

+ *    Revision 1.10  2001/05/29 11:52:21  oes
+ *    Conditional compilation of w32_socket_error
+ *
+ *    Revision 1.9  2001/05/28 16:15:17  jongfoster
+ *    Improved reporting of errors under Win32.
+ *

  *    Revision 1.8  2001/05/26 17:25:14  jongfoster
  *    Added support for CLF (Common Log Format) and fixed LOG_LEVEL_LOG
  *
  *    Revision 1.8  2001/05/26 17:25:14  jongfoster
  *    Added support for CLF (Common Log Format) and fixed LOG_LEVEL_LOG
  *


@@ -471,11 +477,11 @@ void log_error(int loglevel, char *fmt, ...)
             sval = w32_socket_strerr(ival, tempbuf);
 #else /* ifndef _WIN32 */
             ival = errno; 
             sval = w32_socket_strerr(ival, tempbuf);
 #else /* ifndef _WIN32 */
             ival = errno; 

-#ifndef NOSTRERROR
+#ifdef HAVE_STRERROR

             sval = strerror(ival);
             sval = strerror(ival);

-#else /* def NOSTRERROR */
+#else /* ifndef HAVE_STRERROR */

             sval = NULL;
             sval = NULL;

-#endif /* def NOSTRERROR */
+#endif /* ndef HAVE_STRERROR */

             if (sval == NULL)
             {
                sprintf(tempbuf, "(errno = %d)", ival);
             if (sval == NULL)
             {
                sprintf(tempbuf, "(errno = %d)", ival);


@@ -599,6 +605,7 @@ void log_error(int loglevel, char *fmt, ...)
 }
 
 
 }
 
 

+#ifdef _WIN32

 /*********************************************************************
  *
  * Function    :  w32_socket_strerr
 /*********************************************************************
  *
  * Function    :  w32_socket_strerr


@@ -685,6 +692,7 @@ static char * w32_socket_strerr(int errcode, char * tmp_buf)
    sprintf(tmp_buf, "(error number %d)", errcode);
    return tmp_buf;
 }
    sprintf(tmp_buf, "(error number %d)", errcode);
    return tmp_buf;
 }

+#endif /* def _WIN32 */

 
 
 /*
 
 
 /*