---------------------
PatchSet 6470 
Date: 2008/01/09 00:51:31
Author: amosjeffries
Branch: ayjwork
Tag: (none) 
Log:
Compile errors in squid.conf include directive port.

Members: 
	src/cache_cf.cc:1.79.2.13->1.79.2.14 

Index: squid3/src/cache_cf.cc
===================================================================
RCS file: /cvsroot/squid-sf//squid3/src/cache_cf.cc,v
retrieving revision 1.79.2.13
retrieving revision 1.79.2.14
diff -u -r1.79.2.13 -r1.79.2.14
--- squid3/src/cache_cf.cc	8 Jan 2008 07:11:21 -0000	1.79.2.13
+++ squid3/src/cache_cf.cc	9 Jan 2008 00:51:31 -0000	1.79.2.14
@@ -1,6 +1,6 @@
 
 /*
- * $Id: cache_cf.cc,v 1.79.2.13 2008/01/08 07:11:21 amosjeffries Exp $
+ * $Id: cache_cf.cc,v 1.79.2.14 2008/01/09 00:51:31 amosjeffries Exp $
  *
  * DEBUG: section 3     Configuration File Parsing
  * AUTHOR: Harvest Derived
@@ -204,16 +204,17 @@
 }
 
 int
-parseOneConfigFile(const char *file_name, unsigned int depth, CacheManager & manager)
+parseOneConfigFile(const char *file_name, unsigned int depth)
 {
     FILE *fp = NULL;
     const char *orig_cfg_filename = cfg_filename;
-    int orig_config_line = config_lineno;
+    const int orig_config_lineno = config_lineno;
     char *token = NULL;
     char *tmp_line = NULL;
     int tmp_line_len = 0;
     int err_count = 0;
     int is_pipe = 0;
+    unsigned int i = 0;
 
     debug(3, 1) ("Including Configuration File: %s (depth %d)\n", file_name, depth);
     if (depth > 16) {
@@ -350,7 +351,7 @@
 
     default_all();
 
-    err_count = parseOneConfigFile(file_name, 1, manager);
+    err_count = parseOneConfigFile(file_name, 1);
 
     defaults_if_none();