update from John Gilmore for gcc

[unix-history] / usr / src / usr.bin / pascal / libpc / READ4.c

diff --git a/usr/src/usr.bin/pascal/libpc/READ4.c b/usr/src/usr.bin/pascal/libpc/READ4.c
index 43eeaf0..f91273f 100644 (file)
--- a/usr/src/usr.bin/pascal/libpc/READ4.c
+++ b/usr/src/usr.bin/pascal/libpc/READ4.c
@@ -1,6 +1,6 @@
 /* Copyright (c) 1979 Regents of the University of California */
 
 /* Copyright (c) 1979 Regents of the University of California */
 

-static char sccsid[] = "@(#)READ4.c 1.8 %G%";
+static char sccsid[] = "@(#)READ4.c 1.9 %G%";

 
 #include "h00vars.h"
 #include <errno.h>
 
 #include "h00vars.h"
 #include <errno.h>


@@ -17,26 +17,21 @@ READ4(curfile)
        if (curfile->funit & FWRITE) {
                ERROR("%s: Attempt to read, but open for writing\n",
                        curfile->pfname);
        if (curfile->funit & FWRITE) {
                ERROR("%s: Attempt to read, but open for writing\n",
                        curfile->pfname);

-               return;

        }
        UNSYNC(curfile);
        errno = 0;
        retval = fscanf(curfile->fbuf, "%ld", &data);
        if (retval == EOF) {
                ERROR("%s: Tried to read past end of file\n", curfile->pfname);
        }
        UNSYNC(curfile);
        errno = 0;
        retval = fscanf(curfile->fbuf, "%ld", &data);
        if (retval == EOF) {
                ERROR("%s: Tried to read past end of file\n", curfile->pfname);

-               return;

        }
        if (retval == 0) {
                ERROR("%s: Bad data found on integer read\n", curfile->pfname);
        }
        if (retval == 0) {
                ERROR("%s: Bad data found on integer read\n", curfile->pfname);

-               return;

        }
        if (errno == ERANGE) {
                ERROR("%s: Overflow on integer read\n", curfile->pfname);
        }
        if (errno == ERANGE) {
                ERROR("%s: Overflow on integer read\n", curfile->pfname);

-               return;

        }
        if (errno != 0) {
                PERROR("Error encountered on integer read ", curfile->pfname);
        }
        if (errno != 0) {
                PERROR("Error encountered on integer read ", curfile->pfname);

-               return;

        }
        return data;
 }
        }
        return data;
 }