--------------------- PatchSet 399 Date: 2002/12/15 06:36:37 Author: rbcollins Branch: unify-io Tag: (none) Log: eliminate use of fsdata in coss Members: src/fs/coss/store_coss.h:1.3.10.36->1.3.10.37 src/fs/coss/store_dir_coss.cc:1.4.10.43->1.4.10.44 Index: squid3/src/fs/coss/store_coss.h =================================================================== RCS file: /cvsroot/squid-sf//squid3/src/fs/coss/store_coss.h,v retrieving revision 1.3.10.36 retrieving revision 1.3.10.37 diff -u -r1.3.10.36 -r1.3.10.37 --- squid3/src/fs/coss/store_coss.h 15 Dec 2002 06:35:11 -0000 1.3.10.36 +++ squid3/src/fs/coss/store_coss.h 15 Dec 2002 06:36:37 -0000 1.3.10.37 @@ -35,13 +35,6 @@ } flags; }; - -/* Per-storedir info */ -struct _cossinfo { - // async_queue_t aq; - dlink_node *walk_current; -}; - struct _cossindex { /* Note: the dlink_node MUST be the first member of the structure. * This member is later pointer typecasted to coss_index_node *. @@ -80,7 +73,6 @@ }; typedef struct _cossmembuf CossMemBuf; -typedef struct _cossinfo CossInfo; typedef struct _cossindex CossIndexNode; /* Whether the coss system has been setup or not */ Index: squid3/src/fs/coss/store_dir_coss.cc =================================================================== RCS file: /cvsroot/squid-sf//squid3/src/fs/coss/store_dir_coss.cc,v retrieving revision 1.4.10.43 retrieving revision 1.4.10.44 diff -u -r1.4.10.43 -r1.4.10.44 --- squid3/src/fs/coss/store_dir_coss.cc 15 Dec 2002 06:35:11 -0000 1.4.10.43 +++ squid3/src/fs/coss/store_dir_coss.cc 15 Dec 2002 06:36:37 -0000 1.4.10.44 @@ -1,6 +1,6 @@ /* - * $Id: store_dir_coss.cc,v 1.4.10.43 2002/12/15 06:35:11 rbcollins Exp $ + * $Id: store_dir_coss.cc,v 1.4.10.44 2002/12/15 06:36:37 rbcollins Exp $ * * DEBUG: section 47 Store COSS Directory Routines * AUTHOR: Eric Stern @@ -710,21 +710,15 @@ { unsigned int i; unsigned int size; - CossInfo *cs; i = GetInteger(); size = i << 10; /* Mbytes to Kbytes */ if (size <= 0) fatal("storeCossDirParse: invalid size value"); - cs = (CossInfo *)xmalloc(sizeof(CossInfo)); - if (cs == NULL) - fatal("storeCossDirParse: couldn't xmalloc() CossInfo!\n"); - index = anIndex; path = xstrdup(aPath); max_size = size; - fsdata = cs; parse_cachedir_options(this, NULL, 0); /* Enforce maxobjsize being set to something */