---------------------
PatchSet 1608 
Date: 2001/02/18 11:42:43
Author: rbcollins
Branch: rbcollins_filters
Tag: (none) 
Log:
fixups

Members: 
	src/Makefile.in:1.1.1.3.8.8.2.7->1.1.1.3.8.8.2.8 
	src/cache_cf.c:1.1.1.3.4.1.4.7.4.11->1.1.1.3.4.1.4.7.4.12 
	src/typedefs.h:1.1.1.3.8.7.4.17->1.1.1.3.8.7.4.18 

Index: squid/src/Makefile.in
===================================================================
RCS file: /cvsroot/squid-sf//squid/src/Attic/Makefile.in,v
retrieving revision 1.1.1.3.8.8.2.7
retrieving revision 1.1.1.3.8.8.2.8
diff -u -r1.1.1.3.8.8.2.7 -r1.1.1.3.8.8.2.8
--- squid/src/Makefile.in	18 Feb 2001 08:13:44 -0000	1.1.1.3.8.8.2.7
+++ squid/src/Makefile.in	18 Feb 2001 11:42:43 -0000	1.1.1.3.8.8.2.8
@@ -1,7 +1,7 @@
 #
 #  Makefile for the Squid Object Cache server
 #
-#  $Id: Makefile.in,v 1.1.1.3.8.8.2.7 2001/02/18 08:13:44 rbcollins Exp $
+#  $Id: Makefile.in,v 1.1.1.3.8.8.2.8 2001/02/18 11:42:43 rbcollins Exp $
 #
 #  Uncomment and customize the following to suit your needs:
 #
@@ -49,8 +49,8 @@
 
 AUTH_OBJS	= @AUTH_OBJS@
 AUTH_MODULES	= @AUTH_MODULES@
-INTERNAL_MODULE_OBJS   = @CONF_MODULE_OBJS@
-INTERNAL_MODULES       = @CONF_MODULES@
+INTERNAL_MODULE_OBJS	= @CONF_MODULE_OBJS@
+INTERNAL_MODULES	= @CONF_MODULES@
 CC		= @CC@
 MAKEDEPEND	= @MAKEDEPEND@
 INSTALL		= @INSTALL@
Index: squid/src/cache_cf.c
===================================================================
RCS file: /cvsroot/squid-sf//squid/src/cache_cf.c,v
retrieving revision 1.1.1.3.4.1.4.7.4.11
retrieving revision 1.1.1.3.4.1.4.7.4.12
diff -u -r1.1.1.3.4.1.4.7.4.11 -r1.1.1.3.4.1.4.7.4.12
--- squid/src/cache_cf.c	18 Feb 2001 08:13:44 -0000	1.1.1.3.4.1.4.7.4.11
+++ squid/src/cache_cf.c	18 Feb 2001 11:42:44 -0000	1.1.1.3.4.1.4.7.4.12
@@ -1,6 +1,6 @@
 
 /*
- * $Id: cache_cf.c,v 1.1.1.3.4.1.4.7.4.11 2001/02/18 08:13:44 rbcollins Exp $
+ * $Id: cache_cf.c,v 1.1.1.3.4.1.4.7.4.12 2001/02/18 11:42:44 rbcollins Exp $
  *
  * DEBUG: section 3     Configuration File Parsing
  * AUTHOR: Harvest Derived
@@ -996,102 +996,6 @@
     }
 }
 
-
-CBDATA_TYPE(modNode);
-/* Operation of modNode cbdata:
-   config allocates the record, and free frees it.
-   any configuration that depends on the record 
-	locks it and
-   any matching free configuration 
-        unlocks it
-*/
-
-const char *
-mod_type_str(const mod_t type)
-{
-    switch (type) {
-    case MOD_INTERNAL:
-        return "internal";
-        break;
-    case MOD_EXTERNAL:
-        return "external";
-        break;
-    default:
-        return "unknown";
-        break;
-    }
-}
-
-
-/* TODO: write a cbdataFree handler for modNode's. */
-static void
-parse_mod_install(modConfig * cfg) {
-    char *type_str=NULL, *name_str=NULL;
-    mod_t type=MOD_NONE;
-    modNode *node= NULL;
-    int rv;
-
-    if ((type_str = strtok(NULL, w_space)) == NULL)
-	self_destruct();
-
-    if ((name_str = strtok(NULL, w_space)) == NULL)
-	self_destruct();
-
-
-
-    if (strcasecmp(type_str,"internal")==0) {
-	/* internal module */
-	type=MOD_INTERNAL;
-    } else if (strcasecmp(type_str,"external")==0) {
-	/* external module */
-	debug(3,0)("external modules not supported yet\n");
-    } 
-    if (type==MOD_NONE) 
-	self_destruct();
-
-    CBDATA_INIT_TYPE(modNode);
-    node=CBDATA_ALLOC(modNode, NULL);
-    assert(node);
-    node->type=type;
-    node->namestr=xstrdup(name_str);
-    if (type==MOD_INTERNAL)
-        rv = mod_internal_install(node->namestr, node);
-#if 0
-    else if (type==MOD_EXTERNAL)
-	rv = mod_external_install(node->namestr, node);
-#endif
-    else 
-	rv=0;
-    if (rv)
-        dlinkAddTail(node,&node->node,&cfg->modules);
-    else {
-	safe_free(node->namestr);
-	cbdataFree(node);
-    }
-
-}
-
-static void
-free_mod_install(modConfig * cfg) {
-    dlink_node *node,*tmpnode;
-    modNode *module;
-    node=cfg->modules.head;
-    while (node) {
-        tmpnode=node;
-	module=node->data;
-	node=node->next;
-	dlinkDelete(tmpnode,&cfg->modules);
-	module->uninstall(module->namestr);
-	cbdataFree(module);
-    }
-    cfg->modules.head=NULL;
-    cfg->modules.tail=NULL;
-}
-
-static void
-dump_mod_install(StoreEntry * entry, const char *name, modConfig cfg){
-}
-
 CBDATA_TYPE(filterAccess);
 
 static void
Index: squid/src/typedefs.h
===================================================================
RCS file: /cvsroot/squid-sf//squid/src/typedefs.h,v
retrieving revision 1.1.1.3.8.7.4.17
retrieving revision 1.1.1.3.8.7.4.18
diff -u -r1.1.1.3.8.7.4.17 -r1.1.1.3.8.7.4.18
--- squid/src/typedefs.h	18 Feb 2001 08:13:45 -0000	1.1.1.3.8.7.4.17
+++ squid/src/typedefs.h	18 Feb 2001 11:42:44 -0000	1.1.1.3.8.7.4.18
@@ -1,6 +1,6 @@
 
 /*
- * $Id: typedefs.h,v 1.1.1.3.8.7.4.17 2001/02/18 08:13:45 rbcollins Exp $
+ * $Id: typedefs.h,v 1.1.1.3.8.7.4.18 2001/02/18 11:42:44 rbcollins Exp $
  *
  *
  * SQUID Web Proxy Cache          http://www.squid-cache.org/
@@ -384,16 +384,6 @@
 
 /* name to register under */
 typedef void MOD_INSTALL(const char *);
-typedef void MOD_UNINSTALL(const char *);
-
-
-
-/* modules.c */
-typedef struct _modConfig modConfig;
-typedef struct _modNode modNode;
-
-/* name to register under */
-typedef void MOD_INSTALL(const char *);
 typedef unsigned int MOD_UNINSTALL(const char *);