--------------------- PatchSet 985 Date: 2000/12/22 12:45:44 Author: nikitadanilov Branch: raid Tag: (none) Log: addred #if defined( DISK_REPL ) around of initialization of fde.swap_dir field. Members: src/fd.c:1.4.10.1.2.1->1.4.10.1.2.2 Index: squid/src/fd.c =================================================================== RCS file: /cvsroot/squid-sf//squid/src/fd.c,v retrieving revision 1.4.10.1.2.1 retrieving revision 1.4.10.1.2.2 diff -u -r1.4.10.1.2.1 -r1.4.10.1.2.2 --- squid/src/fd.c 17 Dec 2000 14:36:24 -0000 1.4.10.1.2.1 +++ squid/src/fd.c 22 Dec 2000 12:45:44 -0000 1.4.10.1.2.2 @@ -1,6 +1,6 @@ /* - * $Id: fd.c,v 1.4.10.1.2.1 2000/12/17 14:36:24 hno Exp $ + * $Id: fd.c,v 1.4.10.1.2.2 2000/12/22 12:45:44 nikitadanilov Exp $ * * DEBUG: section 51 Filedescriptor Functions * AUTHOR: Duane Wessels @@ -88,7 +88,9 @@ commUpdateWriteBits(fd, NULL); memset(F, '\0', sizeof(fde)); F->timeout = 0; +#if defined( DISK_REPL ) F->swap_dir = -1; +#endif CLEAR_CAN_READ( fd ); CLEAR_CAN_WRITE( fd ); } @@ -96,9 +98,8 @@ void fd_open(int fd, unsigned int type, const char *desc) { - fde *F; + fde *F = &fd_table[fd]; assert(fd >= 0); - F = &fd_table[fd]; if (F->flags.open) { debug(51, 1) ("WARNING: Closing open FD %4d\n", fd); fd_close(fd); @@ -111,7 +112,9 @@ if (desc) xstrncpy(F->desc, desc, FD_DESC_SZ); Number_FD++; +#if defined( DISK_REPL ) F->swap_dir = -1; +#endif } void