]> git.pond.sub.org Git - empserver/commitdiff
Don't cast void to void.
authorMarkus Armbruster <armbru@pond.sub.org>
Mon, 1 Mar 2004 13:56:07 +0000 (13:56 +0000)
committerMarkus Armbruster <armbru@pond.sub.org>
Mon, 1 Mar 2004 13:56:07 +0000 (13:56 +0000)
src/lib/commands/expl.c
src/lib/commands/new.c
src/lib/gen/ioqueue.c
src/lib/player/login.c

index df2ad4d8dea89f825f6e3e21a61f27f8396ba6a6..641e4cf93f81d675db0309dd54d0679410693e9b 100644 (file)
@@ -215,7 +215,7 @@ explore(void)
     }
 
     if (!player->god && !player->owner && sect.sct_type != SCT_SANCT) {
-       (void)takeover(&sect, player->cnum);
+       takeover(&sect, player->cnum);
        justtook = 1;
        sect.sct_oldown = own;
        sect.sct_work = work;
index e651c0b87b64bfd7fb3d045071cfc6ebd333eeb3..969638d00d1ec2139e7cb5c838ab47c53272dbdd 100644 (file)
@@ -106,9 +106,9 @@ new(void)
     } else {
        (void)time(&now);
 #if !defined(_WIN32)
-       (void)srandom(now);
+       srandom(now);
 #else
-       (void)srand(now);
+       srand(now);
 #endif
        for (i = 0; i < 300 && !player->aborted; i++) {
            /* Both x and y should be either odd or even */
index 8cff715c55f2b69dde52455f95ee196b32d2f906..4fbe6c1f57d115207508b94c6811b9a897a19d2f 100644 (file)
@@ -95,9 +95,9 @@ ioq_drain(struct ioqueue *ioq)
 
     while ((qp = ioq->list.queue.q_forw) != &ioq->list.queue) {
        io = (struct io *)qp;
-       (void)emp_remque(&io->queue);
-       (void)free((s_char *)io->data);
-       (void)free((s_char *)io);
+       emp_remque(&io->queue);
+       free(io->data);
+       free(io);
     }
 
     ioq->cc = 0;
@@ -350,17 +350,17 @@ removecc(struct ioqueue *ioq, register int cc)
        there = io->nbytes - io->offset;
        if (there < 0) {
            /* error */
-           (void)emp_remque(&io->queue);
-           (void)free((s_char *)io);
+           emp_remque(&io->queue);
+           free(io);
            continue;
        }
        if (remain >= there) {
            /* not enough or exact; free entry */
            nbytes += there;
            remain -= there;
-           (void)emp_remque(&io->queue);
-           (void)free(io->data);
-           (void)free((s_char *)io);
+           emp_remque(&io->queue);
+           free(io->data);
+           free(io);
        } else {
            /* too much; increment offset */
            io->offset += remain;
index 3f7aa9bc9d1c35f90d861095fa330417c9ea0fa0..393f0eff944baff1d2a43dca0d27be58c467b87b 100644 (file)
@@ -100,7 +100,7 @@ player_login(void *ud)
     }
     player->state = PS_SHUTDOWN;
     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);
        while (io_output(player->iop, IO_WAIT) > 0) ;
     }