Deleted non-errlog debugging code

diff --git a/jcc.c b/jcc.c
index 46d202d..a884031 100644 (file)
--- a/jcc.c
+++ b/jcc.c
@@ -1,4 +1,4 @@
-const char jcc_rcs[] = "$Id: jcc.c,v 1.68 2002/03/04 20:17:32 oes Exp $";
+const char jcc_rcs[] = "$Id: jcc.c,v 1.69 2002/03/04 23:50:00 jongfoster Exp $";
 /*********************************************************************
  *
  * File        :  $Source: /cvsroot/ijbswa/current/jcc.c,v $
@@ -33,6 +33,10 @@ const char jcc_rcs[] = "$Id: jcc.c,v 1.68 2002/03/04 20:17:32 oes Exp $";
  *
  * Revisions   :
  *    $Log: jcc.c,v $
+ *    Revision 1.69  2002/03/04 23:50:00  jongfoster
+ *    Splitting off bind_port() call into bind_port_helper(), with
+ *    improved logging.
+ *
  *    Revision 1.68  2002/03/04 20:17:32  oes
  *    Fixed usage info
  *
@@ -1602,15 +1606,13 @@ int main(int argc, const char *argv[])
    {
       char *abs_file;
 
-      DBG(1, ("configfile before '%s'\n",configfile) );
-
       /* make config-filename absolute here */
       if ( !(basedir = getcwd( NULL, 1024 )))
       {
          perror("get working dir failed");
          exit( 1 );
       }
-      DBG(1, ("working dir '%s'\n",basedir) );
+
       if ( !(abs_file = malloc( strlen( basedir ) + strlen( configfile ) + 5 )))
       {
          perror("malloc failed");
@@ -1620,7 +1622,6 @@ int main(int argc, const char *argv[])
       strcat( abs_file, "/" );
       strcat( abs_file, configfile );
       configfile = abs_file;
-      DBG(1, ("configfile after '%s'\n",configfile) );
    }
 #endif /* defined unix */
 
@@ -1749,7 +1750,6 @@ int main(int argc, const char *argv[])
 }
 #endif /* defined unix */
 
-   DBG(1, ("call listen_loop() \n") );
    listen_loop();
 
    /* NOTREACHED */

diff --git a/loadcfg.c b/loadcfg.c
index e637a58..60db918 100644 (file)
--- a/loadcfg.c
+++ b/loadcfg.c
@@ -1,4 +1,4 @@
-const char loadcfg_rcs[] = "$Id: loadcfg.c,v 1.31 2002/03/03 15:07:20 oes Exp $";
+const char loadcfg_rcs[] = "$Id: loadcfg.c,v 1.32 2002/03/04 18:24:53 oes Exp $";
 /*********************************************************************
  *
  * File        :  $Source: /cvsroot/ijbswa/current/loadcfg.c,v $
@@ -35,6 +35,9 @@ const char loadcfg_rcs[] = "$Id: loadcfg.c,v 1.31 2002/03/03 15:07:20 oes Exp $"
  *
  * Revisions   :
  *    $Log: loadcfg.c,v $
+ *    Revision 1.32  2002/03/04 18:24:53  oes
+ *    Re-enabled output of unknown config directive hash
+ *
  *    Revision 1.31  2002/03/03 15:07:20  oes
  *    Re-enabled automatic config reloading
  *
@@ -466,7 +469,6 @@ struct configuration_spec * load_config(void)
    struct file_list *fs;
    unsigned long linenum = 0;
 
-   DBG(1, ("load_config() entered..\n") );
    if ( !check_file_changed(current_configfile, configfile, &fs))
    {
       /* No need to load */

diff --git a/miscutil.c b/miscutil.c
index a1715d1..bb5677e 100644 (file)
--- a/miscutil.c
+++ b/miscutil.c
@@ -1,4 +1,4 @@
-const char miscutil_rcs[] = "$Id: miscutil.c,v 1.29 2002/03/04 02:08:02 david__schmidt Exp $";
+const char miscutil_rcs[] = "$Id: miscutil.c,v 1.30 2002/03/04 18:27:42 oes Exp $";
 /*********************************************************************
  *
  * File        :  $Source: /cvsroot/ijbswa/current/miscutil.c,v $
@@ -36,6 +36,12 @@ const char miscutil_rcs[] = "$Id: miscutil.c,v 1.29 2002/03/04 02:08:02 david__s
  *
  * Revisions   :
  *    $Log: miscutil.c,v $
+ *    Revision 1.30  2002/03/04 18:27:42  oes
+ *    - Deleted deletePidFile
+ *    - Made write_pid_file use the --pidfile option value
+ *      (or no PID file, if the option was absent)
+ *    - Played styleguide police
+ *
  *    Revision 1.29  2002/03/04 02:08:02  david__schmidt
  *    Enable web editing of actions file on OS/2 (it had been broken all this time!)
  *
@@ -889,7 +895,6 @@ char * make_path(const char * dir, const char * file)
              strcpy(path, basedir);
              strcat(path, "/");
              strcat(path, dir);
-             DBG(1, ("make_path: path: %s\n",path) );
       }
       else
       {

diff --git a/project.h b/project.h
index a0a7678..a308e1a 100644 (file)
--- a/project.h
+++ b/project.h
@@ -1,6 +1,6 @@
 #ifndef PROJECT_H_INCLUDED
 #define PROJECT_H_INCLUDED
-#define PROJECT_H_VERSION "$Id: project.h,v 1.49 2002/03/04 18:28:55 oes Exp $"
+#define PROJECT_H_VERSION "$Id: project.h,v 1.50 2002/03/04 19:32:07 oes Exp $"
 /*********************************************************************
  *
  * File        :  $Source: /cvsroot/ijbswa/current/project.h,v $
@@ -36,6 +36,9 @@
  *
  * Revisions   :
  *    $Log: project.h,v $
+ *    Revision 1.50  2002/03/04 19:32:07  oes
+ *    Changed default port to 8118
+ *
  *    Revision 1.49  2002/03/04 18:28:55  oes
  *    Deleted PID_FILE_NAME
  *
@@ -396,14 +399,6 @@
 extern "C" {
 #endif
 
-#ifdef _DEBUG
-extern int ldebug;
-#define DBG(a,b)        { if ( ldebug >= a ) { printf b ; }}
-#else
-#define DBG(a,b)
-#endif /* _DEBUG */
-
-
 
 /*
  * Error codes.  Functions returning these should return a jb_err