various: appease the ubuntu gcc monster

Silence warnings about not checking
return values from read and write system calls.

R=r, r2
CC=golang-dev
https://golang.org/cl/2258045

diff --git a/src/cmd/5l/asm.c b/src/cmd/5l/asm.c
index 45e6e734fbef42e3b6299f326b489a12d496f588..aeab60a68446deec0b7c755a468fc868d771f2dd 100644 (file)
--- a/src/cmd/5l/asm.c
+++ b/src/cmd/5l/asm.c
@@ -482,7 +482,7 @@ asmb(void)
        if(dlm){
                char buf[8];
 
-               write(cout, buf, INITDAT-textsize);
+               ewrite(cout, buf, INITDAT-textsize);
                textsize = INITDAT;
        }
        for(t = 0; t < datsize; t += sizeof(buf)-100) {
@@ -987,7 +987,7 @@ cflush(void)
        /* no bug if cbc < 0 since obuf(cbuf) followed by ibuf in buf! */
        n = sizeof(buf.cbuf) - cbc;
        if(n)
-               write(cout, buf.cbuf, n);
+               ewrite(cout, buf.cbuf, n);
        cbp = buf.cbuf;
        cbc = sizeof(buf.cbuf);
 }
@@ -1398,7 +1398,7 @@ datblk(int32 s, int32 n, int str)
                        break;
                }
        }
-       write(cout, buf.dbuf, n);
+       ewrite(cout, buf.dbuf, n);
 }
 
 void

diff --git a/src/cmd/6l/asm.c b/src/cmd/6l/asm.c
index d46721568c3b87bdb8a8e781e631577133138fb6..1502ad66023f576743c5a387a6e100a08f9b4022 100644 (file)
--- a/src/cmd/6l/asm.c
+++ b/src/cmd/6l/asm.c
@@ -575,7 +575,7 @@ asmb(void)
        if(dlm){
                char buf[8];
 
-               write(cout, buf, INITDAT-textsize);
+               ewrite(cout, buf, INITDAT-textsize);
                textsize = INITDAT;
        }
 
@@ -649,7 +649,7 @@ asmb(void)
                        cflush();
                        elfstro = seek(cout, 0, 1);
                        elfsymsize = elfstro - elfsymo;
-                       write(cout, elfstrdat, elfstrsize);
+                       ewrite(cout, elfstrdat, elfstrsize);
 
                        if(debug['v'])
                               Bprint(&bso, "%5.2f dwarf\n", cputime());
@@ -938,7 +938,7 @@ cflush(void)
 
        n = sizeof(buf.cbuf) - cbc;
        if(n)
-               write(cout, buf.cbuf, n);
+               ewrite(cout, buf.cbuf, n);
        cbp = buf.cbuf;
        cbc = sizeof(buf.cbuf);
 }
@@ -1208,7 +1208,7 @@ datblk(int32 s, int32 n)
                }
        }
 
-       write(cout, buf.dbuf, n);
+       ewrite(cout, buf.dbuf, n);
        if(!debug['a'])
                return;
 

diff --git a/src/cmd/8l/asm.c b/src/cmd/8l/asm.c
index 0675b904b90b888a9f9e2df5ddd51c37a6187ff7..ec35d8d519a1a1d6e53465478318d1384885ea77 100644 (file)
--- a/src/cmd/8l/asm.c
+++ b/src/cmd/8l/asm.c
@@ -604,7 +604,7 @@ asmb(void)
        if(dlm){
                char buf[8];
 
-               write(cout, buf, INITDAT-textsize);
+               ewrite(cout, buf, INITDAT-textsize);
                textsize = INITDAT;
        }
 
@@ -1080,7 +1080,7 @@ cflush(void)
 
        n = sizeof(buf.cbuf) - cbc;
        if(n)
-               write(cout, buf.cbuf, n);
+               ewrite(cout, buf.cbuf, n);
        cbp = buf.cbuf;
        cbc = sizeof(buf.cbuf);
 }
@@ -1213,7 +1213,7 @@ datblk(int32 s, int32 n, int32 rodata)
                }
        }
 
-       write(cout, buf.dbuf, n);
+       ewrite(cout, buf.dbuf, n);
        if(!debug['a'])
                return;
 

diff --git a/src/cmd/ld/elf.c b/src/cmd/ld/elf.c
index 0ebdcf024c6f5227d659e58f0c693a8b5db205b4..4286349dbe8096911df952194338ebac5dfc76a6 100644 (file)
--- a/src/cmd/ld/elf.c
+++ b/src/cmd/ld/elf.c
@@ -316,7 +316,7 @@ elfwriteinterp(void)
 
        n = strlen(interp)+1;
        seek(cout, ELFRESERVE-n, 0);
-       write(cout, interp, n);
+       ewrite(cout, interp, n);
        return n;
 }
 

diff --git a/src/cmd/ld/lib.c b/src/cmd/ld/lib.c
index 0cdc6778fca8aa037dd80e3e8c05c8994555fd12..3e755d7f961e5aecdee1b454c5465af25e46f085 100644 (file)
--- a/src/cmd/ld/lib.c
+++ b/src/cmd/ld/lib.c
@@ -924,3 +924,12 @@ addsection(Segment *seg, char *name, int rwx)
        *l = sect;
        return sect;
 }
+
+void
+ewrite(int fd, void *buf, int n)
+{
+       if(write(fd, buf, n) < 0) {
+               diag("write error: %r");
+               errorexit();
+       }
+}

diff --git a/src/cmd/ld/lib.h b/src/cmd/ld/lib.h
index 092161e14b53f68531a4d6b6c103223d2ed2db71..b828bed6eaa46f67b7de86f28b52d7ba96b83c2c 100644 (file)
--- a/src/cmd/ld/lib.h
+++ b/src/cmd/ld/lib.h
@@ -128,6 +128,7 @@ void        ldpkg(Biobuf*, char*, int64, char*, int);
 void   mark(Sym *s);
 char*  expandpkg(char*, char*);
 void   deadcode(void);
+void   ewrite(int, void*, int);
 
 int    pathchar(void);
 void*  mal(uint32);

diff --git a/src/cmd/ld/macho.c b/src/cmd/ld/macho.c
index 407fb553d43e7c874450a049becdb99e56428d00..b3b1f8c49739c06c77248f1a6a03f9ebd2bd52ed 100644 (file)
--- a/src/cmd/ld/macho.c
+++ b/src/cmd/ld/macho.c
@@ -430,8 +430,8 @@ domacholink(void)
                        }
                }
 
-               write(cout, linkdata, nlinkdata);
-               write(cout, strtab, nstrtab);
+               ewrite(cout, linkdata, nlinkdata);
+               ewrite(cout, strtab, nstrtab);
        }
        return rnd(nlinkdata+nstrtab, INITRND);
 }

diff --git a/src/libmach/executable.c b/src/libmach/executable.c
index 34da7215197a0f3ac87204b74158ae07f87eff78..98aae3e52905f271c234c0e5425c639d1f16101e 100644 (file)
--- a/src/libmach/executable.c
+++ b/src/libmach/executable.c
@@ -786,7 +786,8 @@ error:
                        goto done;
                memset(buf, 0, sizeof buf);
                seek(fd, sh[ep->shstrndx].offset, 0);
-               read(fd, buf, sh[ep->shstrndx].size);
+               i = read(fd, buf, sh[ep->shstrndx].size);
+               USED(i);        // shut up ubuntu gcc
 
                for(i = 0; i < ep->shnum; i++) {
                        if (strcmp(&buf[sh[i].name], ".gosymtab") == 0) {
@@ -967,7 +968,8 @@ error:
                        goto done;
                memset(buf, 0, sizeof buf);
                seek(fd, sh[ep->shstrndx].offset, 0);
-               read(fd, buf, sh[ep->shstrndx].size);
+               i = read(fd, buf, sh[ep->shstrndx].size);
+               USED(i);        // shut up ubuntu gcc
 
                for(i = 0; i < ep->shnum; i++) {
                        if (strcmp(&buf[sh[i].name], ".gosymtab") == 0) {