From 571a3b8fe07c86d3995651422ffe6e14cfecff0a Mon Sep 17 00:00:00 2001 From: jongfoster Date: Wed, 6 Mar 2002 23:02:57 +0000 Subject: [PATCH] Removing tabs --- errlog.c | 18 +++++++++++------- errlog.h | 7 +++++-- miscutil.c | 35 +++++++++++++++++++---------------- 3 files changed, 35 insertions(+), 25 deletions(-) diff --git a/errlog.c b/errlog.c index e38c01e3..7dff2dbe 100644 --- a/errlog.c +++ b/errlog.c @@ -1,4 +1,4 @@ -const char errlog_rcs[] = "$Id: errlog.c,v 1.29 2002/03/04 23:45:13 jongfoster Exp $"; +const char errlog_rcs[] = "$Id: errlog.c,v 1.30 2002/03/05 22:43:45 david__schmidt Exp $"; /********************************************************************* * * File : $Source: /cvsroot/ijbswa/current/errlog.c,v $ @@ -33,6 +33,10 @@ const char errlog_rcs[] = "$Id: errlog.c,v 1.29 2002/03/04 23:45:13 jongfoster E * * Revisions : * $Log: errlog.c,v $ + * Revision 1.30 2002/03/05 22:43:45 david__schmidt + * - Better error reporting on OS/2 + * - Fix double-slash comment (oops) + * * Revision 1.29 2002/03/04 23:45:13 jongfoster * Printing thread ID if using Win32 native threads * @@ -395,11 +399,11 @@ void log_error(int loglevel, char *fmt, ...) { /* - * Write timestamp into tempbuf. - * - * Complex because not all OSs have tm_gmtoff or - * the %z field in strftime() - */ + * Write timestamp into tempbuf. + * + * Complex because not all OSs have tm_gmtoff or + * the %z field in strftime() + */ time_t now; struct tm tm_now; time (&now); @@ -451,7 +455,7 @@ void log_error(int loglevel, char *fmt, ...) outc = sprintf(outbuf, "IJB(%ld) Gif-Deanimate: ", this_thread); break; case LOG_LEVEL_CLF: - outbuf = outbuf_save; + outbuf = outbuf_save; outc = 0; outbuf[0] = '\0'; break; diff --git a/errlog.h b/errlog.h index a28daf68..e8663530 100644 --- a/errlog.h +++ b/errlog.h @@ -1,6 +1,6 @@ #ifndef ERRLOG_H_INCLUDED #define ERRLOG_H_INCLUDED -#define ERRLOG_H_VERSION "$Id: errlog.h,v 1.9 2001/07/30 22:08:36 jongfoster Exp $" +#define ERRLOG_H_VERSION "$Id: errlog.h,v 1.10 2001/09/13 20:08:06 jongfoster Exp $" /********************************************************************* * * File : $Source: /cvsroot/ijbswa/current/errlog.h,v $ @@ -35,6 +35,9 @@ * * Revisions : * $Log: errlog.h,v $ + * Revision 1.10 2001/09/13 20:08:06 jongfoster + * Adding support for LOG_LEVEL_CGI + * * Revision 1.9 2001/07/30 22:08:36 jongfoster * Tidying up #defines: * - All feature #defines are now of the form FEATURE_xxx @@ -137,7 +140,7 @@ extern "C" { #define LOG_LEVEL_CLF 0x0200 /* Common Log File format */ #ifdef FEATURE_KILL_POPUPS -#define LOG_LEVEL_POPUPS 0x0400 /* Kill Popups */ +#define LOG_LEVEL_POPUPS 0x0400 /* Kill Popups */ #endif /* def FEATURE_KILL_POPUPS */ #define LOG_LEVEL_CGI 0x0800 /* CGI / templates */ diff --git a/miscutil.c b/miscutil.c index bb5677e8..74b894b7 100644 --- a/miscutil.c +++ b/miscutil.c @@ -1,4 +1,4 @@ -const char miscutil_rcs[] = "$Id: miscutil.c,v 1.30 2002/03/04 18:27:42 oes Exp $"; +const char miscutil_rcs[] = "$Id: miscutil.c,v 1.31 2002/03/05 04:52:42 oes Exp $"; /********************************************************************* * * File : $Source: /cvsroot/ijbswa/current/miscutil.c,v $ @@ -36,6 +36,9 @@ const char miscutil_rcs[] = "$Id: miscutil.c,v 1.30 2002/03/04 18:27:42 oes Exp * * Revisions : * $Log: miscutil.c,v $ + * Revision 1.31 2002/03/05 04:52:42 oes + * Deleted non-errlog debugging code + * * Revision 1.30 2002/03/04 18:27:42 oes * - Deleted deletePidFile * - Made write_pid_file use the --pidfile option value @@ -890,17 +893,17 @@ char * make_path(const char * dir, const char * file) #if defined(unix) if ( *dir != '/' && basedir && *basedir ) { - path = malloc( strlen( basedir ) + strlen(dir) + strlen(file) + 3); - if (!path ) log_error(LOG_LEVEL_FATAL, "malloc failed!"); - strcpy(path, basedir); - strcat(path, "/"); - strcat(path, dir); + path = malloc( strlen( basedir ) + strlen(dir) + strlen(file) + 3); + if (!path ) log_error(LOG_LEVEL_FATAL, "malloc failed!"); + strcpy(path, basedir); + strcat(path, "/"); + strcat(path, dir); } else { - path = malloc(strlen(dir) + strlen(file) + 2); - if (!path ) log_error(LOG_LEVEL_FATAL, "malloc failed!"); - strcpy(path, dir); + path = malloc(strlen(dir) + strlen(file) + 2); + if (!path ) log_error(LOG_LEVEL_FATAL, "malloc failed!"); + strcpy(path, dir); } #else @@ -1013,24 +1016,24 @@ Author * Small values favor memcpy, large values favor inline code. */ #if defined(__alpha__) || defined(__alpha) -# define breakeven_point 2 /* AXP (DEC Alpha) - gcc or cc or egcs */ +# define breakeven_point 2 /* AXP (DEC Alpha) - gcc or cc or egcs */ #endif #if defined(__i386__) || defined(__i386) -# define breakeven_point 12 /* Intel Pentium/Linux - gcc 2.96 */ +# define breakeven_point 12 /* Intel Pentium/Linux - gcc 2.96 */ #endif #if defined(__hppa) -# define breakeven_point 10 /* HP-PA - gcc */ +# define breakeven_point 10 /* HP-PA - gcc */ #endif #if defined(__sparc__) || defined(__sparc) -# define breakeven_point 33 /* Sun Sparc 5 - gcc 2.8.1 */ +# define breakeven_point 33 /* Sun Sparc 5 - gcc 2.8.1 */ #endif /* some other values of possible interest: */ -/* #define breakeven_point 8 */ /* VAX 4000 - vaxc */ -/* #define breakeven_point 19 */ /* VAX 4000 - gcc 2.7.0 */ +/* #define breakeven_point 8 */ /* VAX 4000 - vaxc */ +/* #define breakeven_point 19 */ /* VAX 4000 - gcc 2.7.0 */ #ifndef breakeven_point -# define breakeven_point 6 /* some reasonable one-size-fits-all value */ +# define breakeven_point 6 /* some reasonable one-size-fits-all value */ #endif #define fast_memcpy(d,s,n) \ -- 2.39.2