From 1ee6757825a5edace66edbfa2469bd4fc52f421e Mon Sep 17 00:00:00 2001 From: robertc <> Date: Thu, 23 Aug 2001 19:20:46 +0000 Subject: [PATCH] rename cf_parser.c to cf_parser.h to reduce difference between HEAD and automake branch - allowing for a code-change-free patch set --- src/Makefile.in | 12 ++++++------ src/cache_cf.cc | 4 ++-- src/cf_gen.cc | 8 ++++---- 3 files changed, 12 insertions(+), 12 deletions(-) diff --git a/src/Makefile.in b/src/Makefile.in index 54d7121ba1..c1d6905a66 100644 --- a/src/Makefile.in +++ b/src/Makefile.in @@ -1,7 +1,7 @@ # # Makefile for the Squid Object Cache server # -# $Id: Makefile.in,v 1.205 2001/08/22 09:25:41 robertc Exp $ +# $Id: Makefile.in,v 1.206 2001/08/23 13:20:46 robertc Exp $ # # Uncomment and customize the following to suit your needs: # @@ -253,12 +253,12 @@ cache_diff: cache_diff.o debug.o globals.o store_key_md5.o test_cache_digest: test_cache_digest.o CacheDigest.o debug.o globals.o store_key_md5.o $(CC) -o $@ $(LDFLAGS) $@.o CacheDigest.o debug.o globals.o store_key_md5.o $(STD_APP_LIBS) -cache_cf.o: cf_parser.c +cache_cf.o: cf_parser.h -squid.conf.default: cf_parser.c +squid.conf.default: cf_parser.h @sh -c "test -f squid.conf.default || ./cf_gen cf.data" -cf_parser.c: cf.data cf_gen +cf_parser.h: cf.data cf_gen ./cf_gen cf.data cf_gen: cf_gen.o @@ -424,7 +424,7 @@ install-pinger: clean: -rm -rf *.o *pure_* core $(PROGS) $(UTILS) $(CGIPROGS) $(SUID_UTILS) - -rm -f cf_gen cf_gen_defines.h cf_parser.c cf.data globals.c string_arrays.c + -rm -f cf_gen cf_gen_defines.h cf_parser.h cf.data globals.c string_arrays.c -rm -f store_modules.c repl_modules.c auth_modules.c squid.conf.default @for dir in $(SUBDIRS); do \ echo "Making $@ in $$dir..."; \ @@ -443,5 +443,5 @@ distclean: clean tags: ctags *.[ch] ../include/*.h ../lib/*.[ch] -depend: cf_parser.c +depend: cf_parser.h $(MAKEDEPEND) $(INCLUDE) -fMakefile $(srcdir)/*.c diff --git a/src/cache_cf.cc b/src/cache_cf.cc index a1961a025a..0bda6cd062 100644 --- a/src/cache_cf.cc +++ b/src/cache_cf.cc @@ -1,6 +1,6 @@ /* - * $Id: cache_cf.cc,v 1.389 2001/08/19 16:28:33 wessels Exp $ + * $Id: cache_cf.cc,v 1.390 2001/08/23 13:20:46 robertc Exp $ * * DEBUG: section 3 Configuration File Parsing * AUTHOR: Harvest Derived @@ -2075,7 +2075,7 @@ dump_removalpolicy(StoreEntry * entry, const char *name, RemovalPolicySettings * } -#include "cf_parser.c" +#include "cf_parser.h" peer_t parseNeighborType(const char *s) diff --git a/src/cf_gen.cc b/src/cf_gen.cc index 82c434baa0..fa38d2a6a6 100644 --- a/src/cf_gen.cc +++ b/src/cf_gen.cc @@ -1,8 +1,8 @@ /* - * $Id: cf_gen.cc,v 1.41 2001/08/19 03:49:38 robertc Exp $ + * $Id: cf_gen.cc,v 1.42 2001/08/23 13:20:46 robertc Exp $ * - * DEBUG: none Generate squid.conf.default and cf_parser.c + * DEBUG: none Generate squid.conf.default and cf_parser.h * AUTHOR: Max Okumoto * * SQUID Web Proxy Cache http://www.squid-cache.org/ @@ -39,7 +39,7 @@ * (ie it creates the squid.conf.default file from the cf.data file) * * The output files are as follows: - * cf_parser.c - this file contains, default_all() which + * cf_parser.h - this file contains, default_all() which * initializes variables with the default * values, parse_line() that parses line from * squid.conf.default, dump_config that dumps the @@ -76,7 +76,7 @@ #include "util.h" #define MAX_LINE 1024 /* longest configuration line */ -#define _PATH_PARSER "cf_parser.c" +#define _PATH_PARSER "cf_parser.h" #define _PATH_SQUID_CONF "squid.conf.default" enum State { -- 2.47.2