suppress GCC warnings

diff --git a/japanese/jlib.c b/japanese/jlib.c
index 730550b..67a308a 100644 (file)
--- a/japanese/jlib.c
+++ b/japanese/jlib.c
@@ -1303,6 +1303,8 @@ static int
 kanji2index(c1, c2)
 unsigned char c1, c2;
 {
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wmultichar"
 #if (('\81\81')==0x8181)
        /* SJIS */
        if (c1 >= 0xe0) c1 -= 0x40;
@@ -1315,6 +1317,7 @@ unsigned char c1, c2;
        return (((int)c1 & 0x7f) - 0x21) * (0x7e - 0x21 + 1) +
               (((int)c2 & 0x7f) - 0x21);
 #endif
+#pragma GCC diagnostic pop
 }
 
 int

diff --git a/src/files.c b/src/files.c
index d7570a0..77d5af3 100644 (file)
--- a/src/files.c
+++ b/src/files.c
@@ -930,7 +930,10 @@ void
 save_savefile_name(fd)
 int fd;
 {
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wunused-result"
     (void) write(fd, (genericptr_t) SAVEF, sizeof(SAVEF));
+#pragma GCC diagnostic pop
 }
 #endif
 
@@ -1320,8 +1323,11 @@ boolean uncomp;
             redirect(filename, RDBMODE, stdin, uncomp);
             redirect(cfn, WRBMODE, stdout, uncomp);
         }
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wunused-result"
         (void) setgid(getgid());
         (void) setuid(getuid());
+#pragma GCC diagnostic pop
         (void) execv(args[0], (char *const *) args);
         perror((char *) 0);
         (void) fprintf(stderr, "Exec to %scompress %s failed.\n",

diff --git a/src/restore.c b/src/restore.c
index d5d1d39..bd012f7 100644 (file)
--- a/src/restore.c
+++ b/src/restore.c
@@ -1197,8 +1197,11 @@ int fd;
 char *plbuf;
 {
     int pltmpsiz = 0;
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wunused-result"
     (void) read(fd, (genericptr_t) &pltmpsiz, sizeof(pltmpsiz));
     (void) read(fd, (genericptr_t) plbuf, pltmpsiz);
+#pragma GCC diagnostic pop
     return;
 }
 

diff --git a/src/save.c b/src/save.c
index b85c4f9..7dc5fb9 100644 (file)
--- a/src/save.c
+++ b/src/save.c
@@ -411,7 +411,10 @@ savestateinlock()
         if (tricked_fileremoved(fd, whynot))
             return;
 
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wunused-result"
         (void) read(fd, (genericptr_t) &hpid, sizeof(hpid));
+#pragma GCC diagnostic pop
         if (hackpid != hpid) {
             Sprintf(whynot, "Level #0 pid (%d) doesn't match ours (%d)!",
                     hpid, hackpid);
@@ -428,11 +431,17 @@ savestateinlock()
             done(TRICKED);
             return;
         }
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wunused-result"
         (void) write(fd, (genericptr_t) &hackpid, sizeof(hackpid));
+#pragma GCC diagnostic pop
         if (flags.ins_chkpt) {
             int currlev = ledger_no(&u.uz);
 
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wunused-result"
             (void) write(fd, (genericptr_t) &currlev, sizeof(currlev));
+#pragma GCC diagnostic pop
             save_savefile_name(fd);
             store_version(fd);
             store_savefileinfo(fd);

diff --git a/sys/share/unixtty.c b/sys/share/unixtty.c
index 55e362f..3b5814c 100644 (file)
--- a/sys/share/unixtty.c
+++ b/sys/share/unixtty.c
@@ -409,7 +409,10 @@ linux_mapon()
 {
 #ifdef TTY_GRAPHICS
     if (!strcmp(windowprocs.name, "tty") && linux_flag_console) {
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wunused-result"
         write(1, "\033(B", 3);
+#pragma GCC diagnostic pop
     }
 #endif
 }
@@ -419,7 +422,10 @@ linux_mapoff()
 {
 #ifdef TTY_GRAPHICS
     if (!strcmp(windowprocs.name, "tty") && linux_flag_console) {
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wunused-result"
         write(1, "\033(U", 3);
+#pragma GCC diagnostic pop
     }
 #endif
 }

diff --git a/sys/unix/unixmain.c b/sys/unix/unixmain.c
index 9be8572..63edf1c 100644 (file)
--- a/sys/unix/unixmain.c
+++ b/sys/unix/unixmain.c
@@ -474,8 +474,11 @@ boolean wr;
 #endif
         ) {
 #ifdef SECURE
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wunused-result"
         (void) setgid(getgid());
         (void) setuid(getuid()); /* Ron Wessels */
+#pragma GCC diagnostic pop
 #endif
     } else {
 /* non-default data files is a sign that scores may not be

diff --git a/sys/unix/unixunix.c b/sys/unix/unixunix.c
index a84f050..541db70 100644 (file)
--- a/sys/unix/unixunix.c
+++ b/sys/unix/unixunix.c
@@ -303,11 +303,14 @@ int wt;
     linux_mapon();
 #endif
     if ((f = fork()) == 0) { /* child */
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wunused-result"
         (void) setgid(getgid());
         (void) setuid(getuid());
 #ifdef CHDIR
         (void) chdir(getenv("HOME"));
 #endif
+#pragma GCC diagnostic pop
         return (1);
     }
     if (f == -1) { /* cannot fork */

diff --git a/util/recover.c b/util/recover.c
index 5c1c27f..5365c10 100644 (file)
--- a/util/recover.c
+++ b/util/recover.c
@@ -116,8 +116,11 @@ char *argv[];
         && strcmp(dir, HACKDIR)
 #endif
             ) {
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wunused-result"
         (void) setgid(getgid());
         (void) setuid(getuid());
+#pragma GCC diagnostic pop
     }
 #endif /* SECURE && !VMS */
 
@@ -352,7 +355,10 @@ char *basename;
             if (lfd >= 0) {
                 /* any or all of these may not exist */
                 levc = (xchar) lev;
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wunused-result"
                 write(sfd, (genericptr_t) &levc, sizeof(levc));
+#pragma GCC diagnostic pop
                 copy_bytes(lfd, sfd);
                 Close(lfd);
                 (void) unlink(lock);