empire/empserver
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Don't cast void to void.

Browse source
This commit is contained in:
Markus Armbruster 2004-03-01 13:56:07 +00:00
parent 262e1bafba
commit 7c52730439
4 changed files with 12 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/lib/commands/expl.c
View file

@ -215,7 +215,7 @@ explore(void)
} }
if (!player->god && !player->owner && sect.sct_type != SCT_SANCT) { if (!player->god && !player->owner && sect.sct_type != SCT_SANCT) {
(void)takeover(&sect, player->cnum); takeover(&sect, player->cnum);
justtook = 1; justtook = 1;
sect.sct_oldown = own; sect.sct_oldown = own;
sect.sct_work = work; sect.sct_work = work;

4
src/lib/commands/new.c
View file

@ -106,9 +106,9 @@ new(void)
} else { } else {
(void)time(&now); (void)time(&now);
#if !defined(_WIN32) #if !defined(_WIN32)
(void)srandom(now); srandom(now);
#else #else
(void)srand(now); srand(now);
#endif #endif
for (i = 0; i < 300 && !player->aborted; i++) { for (i = 0; i < 300 && !player->aborted; i++) {
/* Both x and y should be either odd or even */ /* Both x and y should be either odd or even */

16
src/lib/gen/ioqueue.c
View file

@ -95,9 +95,9 @@ ioq_drain(struct ioqueue *ioq)
while ((qp = ioq->list.queue.q_forw) != &ioq->list.queue) { while ((qp = ioq->list.queue.q_forw) != &ioq->list.queue) {
io = (struct io *)qp; io = (struct io *)qp;
(void)emp_remque(&io->queue); emp_remque(&io->queue);
(void)free((s_char *)io->data); free(io->data);
(void)free((s_char *)io); free(io);
} }
ioq->cc = 0; ioq->cc = 0;
@ -350,17 +350,17 @@ removecc(struct ioqueue *ioq, register int cc)
there = io->nbytes - io->offset; there = io->nbytes - io->offset;
if (there < 0) { if (there < 0) {
/* error */ /* error */
(void)emp_remque(&io->queue); emp_remque(&io->queue);
(void)free((s_char *)io); free(io);
continue; continue;
} }
if (remain >= there) { if (remain >= there) {
/* not enough or exact; free entry */ /* not enough or exact; free entry */
nbytes += there; nbytes += there;
remain -= there; remain -= there;
(void)emp_remque(&io->queue); emp_remque(&io->queue);
(void)free(io->data); free(io->data);
(void)free((s_char *)io); free(io);
} else { } else {
/* too much; increment offset */ /* too much; increment offset */
io->offset += remain; io->offset += remain;

2
src/lib/player/login.c
View file

@ -100,7 +100,7 @@ player_login(void *ud)
} }
player->state = PS_SHUTDOWN; player->state = PS_SHUTDOWN;
if (!io_eof(player->iop)) { if (!io_eof(player->iop)) {
(void)pr_player(player, C_EXIT, "so long...\n"); pr_player(player, C_EXIT, "so long...\n");
io_noblocking(player->iop, 0); io_noblocking(player->iop, 0);
while (io_output(player->iop, IO_WAIT) > 0) ; while (io_output(player->iop, IO_WAIT) > 0) ;
} }