From: wessels <> Date: Mon, 29 May 2000 06:19:45 +0000 (+0000) Subject: DW: X-Git-Tag: SQUID_3_0_PRE1~1968 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=9539ce69ebc8cab7c7592316b021d636eec78832;p=thirdparty%2Fsquid.git DW: - RHS of pointer assignment can be void without a cast. --- diff --git a/src/fs/diskd/store_dir_diskd.cc b/src/fs/diskd/store_dir_diskd.cc index 1eb38a08ca..a38c3e10c1 100644 --- a/src/fs/diskd/store_dir_diskd.cc +++ b/src/fs/diskd/store_dir_diskd.cc @@ -1,6 +1,6 @@ /* - * $Id: store_dir_diskd.cc,v 1.5 2000/05/28 22:42:39 wessels Exp $ + * $Id: store_dir_diskd.cc,v 1.6 2000/05/29 00:19:45 wessels Exp $ * * DEBUG: section 47 Store Directory Routines * AUTHOR: Duane Wessels @@ -149,7 +149,7 @@ storeDiskdDirMapBitTest(SwapDir * SD, int fn) { sfileno filn = fn; diskdinfo_t *diskdinfo; - diskdinfo = (diskdinfo_t *) SD->fsdata; + diskdinfo = SD->fsdata; return file_map_bit_test(diskdinfo->map, filn); } @@ -158,7 +158,7 @@ storeDiskdDirMapBitSet(SwapDir * SD, int fn) { sfileno filn = fn; diskdinfo_t *diskdinfo; - diskdinfo = (diskdinfo_t *) SD->fsdata; + diskdinfo = SD->fsdata; file_map_bit_set(diskdinfo->map, filn); } @@ -167,14 +167,14 @@ storeDiskdDirMapBitReset(SwapDir * SD, int fn) { sfileno filn = fn; diskdinfo_t *diskdinfo; - diskdinfo = (diskdinfo_t *) SD->fsdata; + diskdinfo = SD->fsdata; file_map_bit_reset(diskdinfo->map, filn); } int storeDiskdDirMapBitAllocate(SwapDir * SD) { - diskdinfo_t *diskdinfo = (diskdinfo_t *) SD->fsdata; + diskdinfo_t *diskdinfo = SD->fsdata; int fn; fn = file_map_allocate(diskdinfo->map, diskdinfo->suggest); file_map_bit_set(diskdinfo->map, fn); @@ -191,7 +191,7 @@ storeDiskdDirMapBitAllocate(SwapDir * SD) static void storeDiskdDirInitBitmap(SwapDir * sd) { - diskdinfo_t *diskdinfo = (diskdinfo_t *) sd->fsdata; + diskdinfo_t *diskdinfo = sd->fsdata; if (diskdinfo->map == NULL) { /* First time */ @@ -206,7 +206,7 @@ storeDiskdDirInitBitmap(SwapDir * sd) static char * storeDiskdDirSwapSubDir(SwapDir * sd, int subdirn) { - diskdinfo_t *diskdinfo = (diskdinfo_t *) sd->fsdata; + diskdinfo_t *diskdinfo = sd->fsdata; LOCAL_ARRAY(char, fullfilename, SQUID_MAXPATHLEN); assert(0 <= subdirn && subdirn < diskdinfo->l1); @@ -259,7 +259,7 @@ storeDiskdDirVerifyDirectory(const char *path) static int storeDiskdDirVerifyCacheDirs(SwapDir * sd) { - diskdinfo_t *diskdinfo = (diskdinfo_t *) sd->fsdata; + diskdinfo_t *diskdinfo = sd->fsdata; int j; const char *path = sd->path; @@ -276,7 +276,7 @@ storeDiskdDirVerifyCacheDirs(SwapDir * sd) static void storeDiskdDirCreateSwapSubDirs(SwapDir * sd) { - diskdinfo_t *diskdinfo = (diskdinfo_t *) sd->fsdata; + diskdinfo_t *diskdinfo = sd->fsdata; int i, k; int should_exist; LOCAL_ARRAY(char, name, MAXPATHLEN); @@ -326,7 +326,7 @@ storeDiskdDirSwapLogFile(SwapDir * sd, const char *ext) static void storeDiskdDirOpenSwapLog(SwapDir * sd) { - diskdinfo_t *diskdinfo = (diskdinfo_t *) sd->fsdata; + diskdinfo_t *diskdinfo = sd->fsdata; char *path; int fd; path = storeDiskdDirSwapLogFile(sd, NULL); @@ -346,7 +346,7 @@ storeDiskdDirOpenSwapLog(SwapDir * sd) static void storeDiskdDirCloseSwapLog(SwapDir * sd) { - diskdinfo_t *diskdinfo = (diskdinfo_t *) sd->fsdata; + diskdinfo_t *diskdinfo = sd->fsdata; if (diskdinfo->swaplog_fd < 0) /* not open */ return; file_close(diskdinfo->swaplog_fd); @@ -371,7 +371,7 @@ storeDiskdDirInit(SwapDir * sd) char skey1[32]; char skey2[32]; char skey3[32]; - diskdinfo_t *diskdinfo = (diskdinfo_t *) sd->fsdata; + diskdinfo_t *diskdinfo = sd->fsdata; static const char *errmsg = "\tFailed to verify one of the swap directories, Check cache.log\n" "\tfor details. Run 'squid -z' to create swap directories\n" @@ -477,7 +477,7 @@ storeDiskdDirCallback(SwapDir * SD) { diomsg M; int x; - diskdinfo_t *diskdinfo = (diskdinfo_t *) SD->fsdata; + diskdinfo_t *diskdinfo = SD->fsdata; if (diskdinfo->away >= diskdinfo->magic2) diskd_stats.block_queue_len++; @@ -823,7 +823,7 @@ static int storeDiskdDirGetNextFile(RebuildState * rb, int *sfileno, int *size) { SwapDir *SD = rb->sd; - diskdinfo_t *diskdinfo = (diskdinfo_t *) SD->fsdata; + diskdinfo_t *diskdinfo = SD->fsdata; int fd = -1; int used = 0; int dirs_opened = 0; @@ -990,7 +990,7 @@ storeDiskdDirRebuild(SwapDir * sd) static void storeDiskdDirCloseTmpSwapLog(SwapDir * sd) { - diskdinfo_t *diskdinfo = (diskdinfo_t *) sd->fsdata; + diskdinfo_t *diskdinfo = sd->fsdata; char *swaplog_path = xstrdup(storeDiskdDirSwapLogFile(sd, NULL)); char *new_path = xstrdup(storeDiskdDirSwapLogFile(sd, ".new")); int fd; @@ -1018,7 +1018,7 @@ storeDiskdDirCloseTmpSwapLog(SwapDir * sd) static FILE * storeDiskdDirOpenTmpSwapLog(SwapDir * sd, int *clean_flag, int *zero_flag) { - diskdinfo_t *diskdinfo = (diskdinfo_t *) sd->fsdata; + diskdinfo_t *diskdinfo = sd->fsdata; char *swaplog_path = xstrdup(storeDiskdDirSwapLogFile(sd, NULL)); char *clean_path = xstrdup(storeDiskdDirSwapLogFile(sd, ".last-clean")); char *new_path = xstrdup(storeDiskdDirSwapLogFile(sd, ".new")); @@ -1204,7 +1204,7 @@ storeDiskdDirWriteCleanClose(SwapDir * sd) static void storeDiskdDirSwapLog(const SwapDir * sd, const StoreEntry * e, int op) { - diskdinfo_t *diskdinfo = (diskdinfo_t *) sd->fsdata; + diskdinfo_t *diskdinfo = sd->fsdata; storeSwapLogData *s = xcalloc(1, sizeof(storeSwapLogData)); s->op = (char) op; s->swap_filen = e->swap_filen; @@ -1263,7 +1263,7 @@ storeDiskdDirClean(int swap_index) N0 = n_diskd_dirs; D0 = diskd_dir_index[swap_index % N0]; SD = &Config.cacheSwap.swapDirs[D0]; - diskdinfo = (diskdinfo_t *) SD->fsdata; + diskdinfo = SD->fsdata; N1 = diskdinfo->l1; D1 = (swap_index / N0) % N1; N2 = diskdinfo->l2; @@ -1342,7 +1342,7 @@ storeDiskdDirCleanEvent(void *unused) if (!storeDiskdDirIs(sd)) continue; diskd_dir_index[n++] = i; - diskdinfo = (diskdinfo_t *) sd->fsdata; + diskdinfo = sd->fsdata; j += (diskdinfo->l1 * diskdinfo->l2); } assert(n == n_diskd_dirs); @@ -1381,7 +1381,7 @@ storeDiskdFilenoBelongsHere(int fn, int F0, int F1, int F2) int filn = fn; diskdinfo_t *diskdinfo; assert(F0 < Config.cacheSwap.n_configured); - diskdinfo = (diskdinfo_t *) Config.cacheSwap.swapDirs[F0].fsdata; + diskdinfo = Config.cacheSwap.swapDirs[F0].fsdata; L1 = diskdinfo->l1; L2 = diskdinfo->l2; D1 = ((filn / L2) / L2) % L1; @@ -1396,7 +1396,7 @@ storeDiskdFilenoBelongsHere(int fn, int F0, int F1, int F2) int storeDiskdDirValidFileno(SwapDir * SD, sfileno filn) { - diskdinfo_t *diskdinfo = (diskdinfo_t *) SD->fsdata; + diskdinfo_t *diskdinfo = SD->fsdata; if (filn < 0) return 0; if (filn > diskdinfo->map->max_n_files) @@ -1567,7 +1567,7 @@ storeDiskdDirCheckObj(SwapDir * SD, const StoreEntry * e) { int loadav; - diskdinfo_t *diskdinfo = (diskdinfo_t *) SD->fsdata; + diskdinfo_t *diskdinfo = SD->fsdata; #if !HEAP_REPLACEMENT if (storeDiskdDirExpiredReferenceAge(SD) < 300) { debug(20, 3) ("storeDiskdDirCheckObj: NO: LRU Age = %d\n", @@ -1766,7 +1766,7 @@ void * storeDiskdShmGet(SwapDir * sd, int *shm_offset) { char *buf; - diskdinfo_t *diskdinfo = (diskdinfo_t *) sd->fsdata; + diskdinfo_t *diskdinfo = sd->fsdata; buf = linklistShift(&diskdinfo->shm.stack); assert(buf); *shm_offset = buf - diskdinfo->shm.buf; @@ -1779,7 +1779,7 @@ void storeDiskdShmPut(SwapDir * sd, int offset) { char *buf; - diskdinfo_t *diskdinfo = (diskdinfo_t *) sd->fsdata; + diskdinfo_t *diskdinfo = sd->fsdata; assert(offset >= 0); assert(offset < SHMBUFS * SHMBUF_BLKSZ); buf = diskdinfo->shm.buf + offset; @@ -1799,7 +1799,7 @@ storeDiskdDirStats(SwapDir * SD, StoreEntry * sentry) #if HAVE_STATVFS struct statvfs sfs; #endif - diskdinfo = (diskdinfo_t *) SD->fsdata; + diskdinfo = SD->fsdata; storeAppendPrintf(sentry, "First level subdirectories: %d\n", diskdinfo->l1); storeAppendPrintf(sentry, "Second level subdirectories: %d\n", diskdinfo->l2); storeAppendPrintf(sentry, "Maximum Size: %d KB\n", SD->max_size); @@ -1893,7 +1893,7 @@ storeDiskdDirReconfigure(SwapDir * sd, int index, char *path) if (sd->flags.read_only != read_only) debug(3, 1) ("Cache dir '%s' now %s\n", path, read_only ? "Read-Only" : "Read-Write"); - diskdinfo = (diskdinfo_t *) sd->fsdata; + diskdinfo = sd->fsdata; diskdinfo->magic1 = magic1; diskdinfo->magic2 = magic2; sd->flags.read_only = read_only; @@ -1903,7 +1903,7 @@ storeDiskdDirReconfigure(SwapDir * sd, int index, char *path) void storeDiskdDirDump(StoreEntry * entry, const char *name, SwapDir * s) { - diskdinfo_t *diskdinfo = (diskdinfo_t *) s->fsdata; + diskdinfo_t *diskdinfo = s->fsdata; storeAppendPrintf(entry, "%s %s %s %d %d %d\n", name, "diskd", @@ -1919,7 +1919,7 @@ storeDiskdDirDump(StoreEntry * entry, const char *name, SwapDir * s) static void storeDiskdDirFree(SwapDir * s) { - diskdinfo_t *diskdinfo = (diskdinfo_t *) s->fsdata; + diskdinfo_t *diskdinfo = s->fsdata; if (diskdinfo->swaplog_fd > -1) { file_close(diskdinfo->swaplog_fd); diskdinfo->swaplog_fd = -1; @@ -1934,7 +1934,7 @@ char * storeDiskdDirFullPath(SwapDir * SD, sfileno filn, char *fullpath) { LOCAL_ARRAY(char, fullfilename, SQUID_MAXPATHLEN); - diskdinfo_t *diskdinfo = (diskdinfo_t *) SD->fsdata; + diskdinfo_t *diskdinfo = SD->fsdata; int L1 = diskdinfo->l1; int L2 = diskdinfo->l2; if (!fullpath) diff --git a/src/fs/diskd/store_io_diskd.cc b/src/fs/diskd/store_io_diskd.cc index 0207de13a4..0643c045db 100644 --- a/src/fs/diskd/store_io_diskd.cc +++ b/src/fs/diskd/store_io_diskd.cc @@ -38,8 +38,9 @@ storeDiskdOpen(SwapDir * SD, StoreEntry * e, STFNCB * file_callback, int x; storeIOState *sio; char *buf; + diskdstate_t *diskdstate; int shm_offset; - diskdinfo_t *diskdinfo = (diskdinfo_t *) SD->fsdata; + diskdinfo_t *diskdinfo = SD->fsdata; debug(81, 3) ("storeDiskdOpen: fileno %08X\n", f); /* * XXX Eventually there should be an option here to fail on open() @@ -52,7 +53,7 @@ storeDiskdOpen(SwapDir * SD, StoreEntry * e, STFNCB * file_callback, } sio = memAllocate(MEM_STORE_IO); cbdataAdd(sio, storeDiskdIOFreeEntry, MEM_STORE_IO); - sio->fsstate = memPoolAlloc(diskd_state_pool); + sio->fsstate = diskdstate = memPoolAlloc(diskd_state_pool); sio->swap_filen = f; sio->swap_dirn = SD->index; @@ -62,17 +63,17 @@ storeDiskdOpen(SwapDir * SD, StoreEntry * e, STFNCB * file_callback, sio->e = e; cbdataLock(callback_data); - ((diskdstate_t *) (sio->fsstate))->flags.writing = 0; - ((diskdstate_t *) (sio->fsstate))->flags.reading = 0; - ((diskdstate_t *) (sio->fsstate))->flags.close_request = 0; - ((diskdstate_t *) (sio->fsstate))->id = diskd_stats.sio_id++; + diskdstate->flags.writing = 0; + diskdstate->flags.reading = 0; + diskdstate->flags.close_request = 0; + diskdstate->id = diskd_stats.sio_id++; buf = storeDiskdShmGet(SD, &shm_offset); /* XXX WRONG!!! :) */ strcpy(buf, storeDiskdDirFullPath(SD, f, NULL)); x = storeDiskdSend(_MQD_OPEN, SD, - ((diskdstate_t *) (sio->fsstate))->id, + diskdstate->id, sio, strlen(buf) + 1, O_RDONLY, @@ -96,7 +97,8 @@ storeDiskdCreate(SwapDir * SD, StoreEntry * e, STFNCB * file_callback, storeIOState *sio; char *buf; int shm_offset; - diskdinfo_t *diskdinfo = (diskdinfo_t *) SD->fsdata; + diskdinfo_t *diskdinfo = SD->fsdata; + diskdstate_t *diskdstate; /* * XXX Eventually there should be an option here to fail on open() * If there are too many requests queued. @@ -111,7 +113,7 @@ storeDiskdCreate(SwapDir * SD, StoreEntry * e, STFNCB * file_callback, sio = memAllocate(MEM_STORE_IO); cbdataAdd(sio, storeDiskdIOFreeEntry, MEM_STORE_IO); - sio->fsstate = memPoolAlloc(diskd_state_pool); + sio->fsstate = diskdstate = memPoolAlloc(diskd_state_pool); sio->swap_filen = f; sio->swap_dirn = SD->index; @@ -121,17 +123,17 @@ storeDiskdCreate(SwapDir * SD, StoreEntry * e, STFNCB * file_callback, sio->e = e; cbdataLock(callback_data); - ((diskdstate_t *) (sio->fsstate))->flags.writing = 0; - ((diskdstate_t *) (sio->fsstate))->flags.reading = 0; - ((diskdstate_t *) (sio->fsstate))->flags.close_request = 0; - ((diskdstate_t *) (sio->fsstate))->id = diskd_stats.sio_id++; + diskdstate->flags.writing = 0; + diskdstate->flags.reading = 0; + diskdstate->flags.close_request = 0; + diskdstate->id = diskd_stats.sio_id++; buf = storeDiskdShmGet(SD, &shm_offset); /* XXX WRONG!!! :) */ strcpy(buf, storeDiskdDirFullPath(SD, f, NULL)); x = storeDiskdSend(_MQD_OPEN, SD, - ((diskdstate_t *) (sio->fsstate))->id, + diskdstate->id, sio, strlen(buf) + 1, sio->mode, @@ -152,7 +154,7 @@ void storeDiskdClose(SwapDir * SD, storeIOState * sio) { int x; - diskdstate_t *diskdstate = (diskdstate_t *) sio->fsstate; + diskdstate_t *diskdstate = sio->fsstate; debug(81, 3) ("storeDiskdClose: dirno %d, fileno %08X\n", SD->index, sio->swap_filen); x = storeDiskdSend(_MQD_CLOSE, @@ -174,7 +176,7 @@ storeDiskdRead(SwapDir * SD, storeIOState * sio, char *buf, size_t size, off_t o int x; int shm_offset; char *rbuf; - diskdstate_t *diskdstate = (diskdstate_t *) sio->fsstate; + diskdstate_t *diskdstate = sio->fsstate; if (!cbdataValid(sio)) return; if (diskdstate->flags.reading) { @@ -212,7 +214,7 @@ storeDiskdWrite(SwapDir * SD, storeIOState * sio, char *buf, size_t size, off_t int x; char *sbuf; int shm_offset; - diskdstate_t *diskdstate = (diskdstate_t *) sio->fsstate; + diskdstate_t *diskdstate = sio->fsstate; debug(81, 3) ("storeDiskdWrite: dirno %d, fileno %08X\n", SD->index, sio->swap_filen); if (!cbdataValid(sio)) { free_func(buf); @@ -243,7 +245,7 @@ storeDiskdUnlink(SwapDir * SD, StoreEntry * e) int x; int shm_offset; char *buf; - diskdinfo_t *diskdinfo = (diskdinfo_t *) SD->fsdata; + diskdinfo_t *diskdinfo = SD->fsdata; debug(81, 3) ("storeDiskdUnlink: dirno %d, fileno %08X\n", SD->index, e->swap_filen); @@ -340,7 +342,7 @@ static void storeDiskdWriteDone(diomsg * M) { storeIOState *sio = M->callback_data; - diskdstate_t *diskdstate = (diskdstate_t *) sio->fsstate; + diskdstate_t *diskdstate = sio->fsstate; Counter.syscalls.disk.writes++; diskdstate->flags.writing = 0; debug(81, 3) ("storeDiskdWriteDone: dirno %d, fileno %08x status %d\n", @@ -421,7 +423,7 @@ storeDiskdSend(int mtype, SwapDir * sd, int id, storeIOState * sio, int size, in static int send_errors = 0; static int last_seq_no = 0; static int seq_no = 0; - diskdinfo_t *diskdinfo = (diskdinfo_t *) sd->fsdata; + diskdinfo_t *diskdinfo = sd->fsdata; M.mtype = mtype; M.callback_data = sio; M.size = size;