httpd-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From p..@hyperreal.org
Subject cvs commit: apachen/src/main http_log.c http_log.h
Date Sun, 04 Jan 1998 16:35:29 GMT
pcs         98/01/04 08:35:29

  Modified:    src/main http_log.c http_log.h
  Log:
  Fix removing errno from APLOG_WIN32ERROR error messages.
  
  Revision  Changes    Path
  1.46      +5 -1      apachen/src/main/http_log.c
  
  Index: http_log.c
  ===================================================================
  RCS file: /export/home/cvs/apachen/src/main/http_log.c,v
  retrieving revision 1.45
  retrieving revision 1.46
  diff -u -r1.45 -r1.46
  --- http_log.c	1998/01/03 00:18:38	1.45
  +++ http_log.c	1998/01/04 16:35:28	1.46
  @@ -315,7 +315,11 @@
   	len += ap_snprintf(errstr + len, sizeof(errstr) - len,
   		"%s(%d): ", file, line);
       }
  -    if (!(level & APLOG_NOERRNO)) {
  +    if (!(level & APLOG_NOERRNO)
  +#ifdef WIN32
  +	&& !(level && APLOG_WIN32ERROR)
  +#endif
  +	) {
   	len += ap_snprintf(errstr + len, sizeof(errstr) - len,
   		"(%d)%s: ", save_errno, strerror(save_errno));
       }
  
  
  
  1.22      +1 -1      apachen/src/main/http_log.h
  
  Index: http_log.h
  ===================================================================
  RCS file: /export/home/cvs/apachen/src/main/http_log.h,v
  retrieving revision 1.21
  retrieving revision 1.22
  diff -u -r1.21 -r1.22
  --- http_log.h	1998/01/04 14:21:55	1.21
  +++ http_log.h	1998/01/04 16:35:28	1.22
  @@ -84,7 +84,7 @@
   #ifdef WIN32
   /* Set to indicate that error msg should come from Win32's GetLastError(),
    * not errno. */
  -#define APLOG_WIN32ERROR	((APLOG_LEVELMASK+1) * 2|APLOG_NOERRNO)
  +#define APLOG_WIN32ERROR	((APLOG_LEVELMASK+1) * 2)
   #endif
   
   #ifndef DEFAULT_LOGLEVEL
  
  
  

Mime
View raw message