cvs commit: apache-1.3/src/main explain.c

[martin]

martin      98/02/22 13:17:05

  Modified:    src/include explain.h
  Removed:     src/main explain.c
  Log:
  Rewrite explain.h to use aplog_error(...APLOG_DEBUG...); remove explain.c
  
  Revision  Changes    Path
  1.6       +23 -12    apache-1.3/src/include/explain.h
  
  Index: explain.h
  ===================================================================
  RCS file: /home/cvs/apache-1.3/src/include/explain.h,v
  retrieving revision 1.5
  retrieving revision 1.6
  diff -u -u -r1.5 -r1.6
  --- explain.h 1997/10/07 05:38:46     1.5
  +++ explain.h 1998/02/22 21:17:04     1.6
  @@ -8,17 +8,28 @@
   #define Explain5(f,a1,a2,a3,a4,a5)
   #define Explain6(f,a1,a2,a3,a4,a5,a6)
   #else
  -#define DEF_Explain  static const char *__ExplainFile=__FILE__;
  -void _Explain(const char *szFile, int nLine, const char *szFmt,...)
  -             __attribute__((format(printf,3,4)));
  -#define Explain0(f)  _Explain(__ExplainFile,__LINE__,f)
  -#define Explain1(f,a1)       _Explain(__ExplainFile,__LINE__,f,a1)
  -#define Explain2(f,a1,a2)    _Explain(__ExplainFile,__LINE__,f,a1,a2)
  -#define Explain3(f,a1,a2,a3) _Explain(__ExplainFile,__LINE__,f,a1,a2,a3)
  -#define Explain4(f,a1,a2,a3,a4)      
_Explain(__ExplainFile,__LINE__,f,a1,a2,a3,a4)
  -#define Explain5(f,a1,a2,a3,a4,a5)   \
  -                     _Explain(__ExplainFile,__LINE__,f,a1,a2,a3,a4,a5)
  -#define Explain6(f,a1,a2,a3,a4,a5,a6)        \
  -                     _Explain(__ExplainFile,__LINE__,f,a1,a2,a3,a4,a5,a6)
  +#include "http_log.h"
  +#define DEF_Explain
  +#define Explain0(f) \
  +        aplog_error(APLOG_MARK, APLOG_DEBUG|APLOG_NOERRNO, NULL, \
  +                    f)
  +#define Explain1(f,a1) \
  +        aplog_error(APLOG_MARK, APLOG_DEBUG|APLOG_NOERRNO, NULL, \
  +                    f,a1)
  +#define Explain2(f,a1,a2) \
  +        aplog_error(APLOG_MARK, APLOG_DEBUG|APLOG_NOERRNO, NULL, \
  +                    f,a1,a2)
  +#define Explain3(f,a1,a2,a3) \
  +        aplog_error(APLOG_MARK, APLOG_DEBUG|APLOG_NOERRNO, NULL, \
  +                    f,a1,a2,a3)
  +#define Explain4(f,a1,a2,a3,a4) \
  +        aplog_error(APLOG_MARK, APLOG_DEBUG|APLOG_NOERRNO, NULL, \
  +                    f,a1,a2,a3,a4)
  +#define Explain5(f,a1,a2,a3,a4,a5)  \
  +        aplog_error(APLOG_MARK, APLOG_DEBUG|APLOG_NOERRNO, NULL, \
  +                    f,a1,a2,a3,a4,a5)
  +#define Explain6(f,a1,a2,a3,a4,a5,a6)   \
  +        aplog_error(APLOG_MARK, APLOG_DEBUG|APLOG_NOERRNO, NULL, \
  +                    f,a1,a2,a3,a4,a5,a6)
   
   #endif