For GCC's (and ANSI's) sake, don't name a formal parameter after a typedef.

SCCS-vsn: usr.bin/f77/libI77/close.c 5.3
SCCS-vsn: usr.bin/f77/libI77/dolio.c 5.3
SCCS-vsn: usr.bin/f77/libI77/due.c 5.2
SCCS-vsn: usr.bin/f77/libI77/sue.c 5.2
SCCS-vsn: usr.bin/f77/libI77/c_sfe.c 5.3
SCCS-vsn: usr.bin/f77/libI77/c_dfe.c 5.3

diff --git a/usr/src/usr.bin/f77/libI77/c_dfe.c b/usr/src/usr.bin/f77/libI77/c_dfe.c
index 87d0d99..b7ab49c 100644 (file)
--- a/usr/src/usr.bin/f77/libI77/c_dfe.c
+++ b/usr/src/usr.bin/f77/libI77/c_dfe.c
@@ -3,7 +3,7 @@
  * All rights reserved.  The Berkeley software License Agreement
  * specifies the terms and conditions for redistribution.
  *
  * All rights reserved.  The Berkeley software License Agreement
  * specifies the terms and conditions for redistribution.
  *

- *     @(#)c_dfe.c     5.2     %G%
+ *     @(#)c_dfe.c     5.3     %G%

  */
 
 /*
  */
 
 /*


@@ -12,7 +12,7 @@
 
 #include "fio.h"
 
 
 #include "fio.h"
 

-c_dfe(a,flag,str) cilist *a; char *str;
+c_dfe(a,flg,str) cilist *a; char *str;

 {      int n;
        sequential = NO;
        external = YES;
 {      int n;
        sequential = NO;
        external = YES;


@@ -28,7 +28,7 @@ c_dfe(a,flag,str) cilist *a; char *str;
        lunit = a->ciunit;
        if(not_legal(lunit)) err(errflag,F_ERUNIT,str);
        curunit = &units[lunit];
        lunit = a->ciunit;
        if(not_legal(lunit)) err(errflag,F_ERUNIT,str);
        curunit = &units[lunit];

-       if(!curunit->ufd && (n=fk_open(flag,DIR,FMT,(ftnint)lunit)))
+       if(!curunit->ufd && (n=fk_open(flg,DIR,FMT,(ftnint)lunit)))

                err(errflag,n,str)
        cf = curunit->ufd;
        elist = YES;
                err(errflag,n,str)
        cf = curunit->ufd;
        elist = YES;

diff --git a/usr/src/usr.bin/f77/libI77/c_sfe.c b/usr/src/usr.bin/f77/libI77/c_sfe.c
index 48e55a2..d4b4c25 100644 (file)
--- a/usr/src/usr.bin/f77/libI77/c_sfe.c
+++ b/usr/src/usr.bin/f77/libI77/c_sfe.c
@@ -3,7 +3,7 @@
  * All rights reserved.  The Berkeley software License Agreement
  * specifies the terms and conditions for redistribution.
  *
  * All rights reserved.  The Berkeley software License Agreement
  * specifies the terms and conditions for redistribution.
  *

- *     @(#)c_sfe.c     5.2     %G%
+ *     @(#)c_sfe.c     5.3     %G%

  */
 
 /*
  */
 
 /*


@@ -12,7 +12,7 @@
 
 #include "fio.h"
 
 
 #include "fio.h"
 

-c_sfe(a,flag,mode,str) cilist *a; char *str; /* check */
+c_sfe(a,flg,mode,str) cilist *a; char *str; /* check */

 {      unit *p;
        int n;
 
 {      unit *p;
        int n;
 


@@ -26,7 +26,7 @@ c_sfe(a,flag,mode,str) cilist *a; char *str; /* check */
        lunit = a->ciunit;
        if(not_legal(lunit)) err(errflag,F_ERUNIT,str);
        curunit = p = &units[lunit];
        lunit = a->ciunit;
        if(not_legal(lunit)) err(errflag,F_ERUNIT,str);
        curunit = p = &units[lunit];

-       if(!p->ufd && (n=fk_open(flag,mode,FMT,(ftnint)lunit)) )
+       if(!p->ufd && (n=fk_open(flg,mode,FMT,(ftnint)lunit)) )

                err(errflag,n,str)
        cf = curunit->ufd;
        elist = YES;
                err(errflag,n,str)
        cf = curunit->ufd;
        elist = YES;

diff --git a/usr/src/usr.bin/f77/libI77/close.c b/usr/src/usr.bin/f77/libI77/close.c
index 9dde390..479aa4e 100644 (file)
--- a/usr/src/usr.bin/f77/libI77/close.c
+++ b/usr/src/usr.bin/f77/libI77/close.c
@@ -3,7 +3,7 @@
  * All rights reserved.  The Berkeley software License Agreement
  * specifies the terms and conditions for redistribution.
  *
  * All rights reserved.  The Berkeley software License Agreement
  * specifies the terms and conditions for redistribution.
  *

- *     @(#)close.c     5.2     %G%
+ *     @(#)close.c     5.3     %G%

  */
 
 /*
  */
 
 /*


@@ -68,9 +68,9 @@ f_exit()
        }
 }
 
        }
 }
 

-t_runc (b, flag, str)
+t_runc (b, flg, str)

 unit   *b;
 unit   *b;

-ioflag flag;
+ioflag flg;

 char   *str;
 {
        long    loc;
 char   *str;
 {
        long    loc;


@@ -81,8 +81,8 @@ char  *str;
                return (OK);    /* don't truncate direct access files, etc. */
        loc = ftell (b->ufd);
        if (truncate (b->ufnm, loc) != 0)
                return (OK);    /* don't truncate direct access files, etc. */
        loc = ftell (b->ufd);
        if (truncate (b->ufnm, loc) != 0)

-               err (flag, errno, str)
+               err (flg, errno, str)

        if (b->uwrt && ! nowreading(b))
        if (b->uwrt && ! nowreading(b))

-               err (flag, errno, str)
+               err (flg, errno, str)

        return (OK);
 }
        return (OK);
 }

diff --git a/usr/src/usr.bin/f77/libI77/dolio.c b/usr/src/usr.bin/f77/libI77/dolio.c
index 54b6661..7932acb 100644 (file)
--- a/usr/src/usr.bin/f77/libI77/dolio.c
+++ b/usr/src/usr.bin/f77/libI77/dolio.c
@@ -3,7 +3,7 @@
  * All rights reserved.  The Berkeley software License Agreement
  * specifies the terms and conditions for redistribution.
  *
  * All rights reserved.  The Berkeley software License Agreement
  * specifies the terms and conditions for redistribution.
  *

- *     @(#)dolio.c     5.2     %G%
+ *     @(#)dolio.c     5.3     %G%

  */
 
 /*
  */
 
 /*


@@ -14,7 +14,7 @@
 #include "lio.h"
 
 
 #include "lio.h"
 
 

-c_le(a,flag) cilist *a;
+c_le(a,flg) cilist *a;

 {      int n;
        lfname = NULL;
        elist = NO;
 {      int n;
        lfname = NULL;
        elist = NO;


@@ -24,7 +24,7 @@ c_le(a,flag) cilist *a;
        lunit = a->ciunit;
        if(not_legal(lunit)) err(errflag,F_ERUNIT,fmtbuf)
        curunit = &units[lunit];
        lunit = a->ciunit;
        if(not_legal(lunit)) err(errflag,F_ERUNIT,fmtbuf)
        curunit = &units[lunit];

-       if(!curunit->ufd && (n=fk_open(flag,SEQ,FMT,(ftnint)lunit)))
+       if(!curunit->ufd && (n=fk_open(flg,SEQ,FMT,(ftnint)lunit)))

                err(errflag,n,fmtbuf)
        cf = curunit->ufd;
        elist = YES;
                err(errflag,n,fmtbuf)
        cf = curunit->ufd;
        elist = YES;

diff --git a/usr/src/usr.bin/f77/libI77/due.c b/usr/src/usr.bin/f77/libI77/due.c
index 2856397..e7d6efd 100644 (file)
--- a/usr/src/usr.bin/f77/libI77/due.c
+++ b/usr/src/usr.bin/f77/libI77/due.c
@@ -3,7 +3,7 @@
  * All rights reserved.  The Berkeley software License Agreement
  * specifies the terms and conditions for redistribution.
  *
  * All rights reserved.  The Berkeley software License Agreement
  * specifies the terms and conditions for redistribution.
  *

- *     @(#)due.c       5.1     %G%
+ *     @(#)due.c       5.2     %G%

  */
 
 /*
  */
 
 /*


@@ -35,7 +35,7 @@ s_wdue(a) cilist *a;
 }
 
 LOCAL
 }
 
 LOCAL

-c_due(a,flag) cilist *a;
+c_due(a,flg) cilist *a;

 {      int n;
        lfname = NULL;
        elist = NO;
 {      int n;
        lfname = NULL;
        elist = NO;


@@ -47,7 +47,7 @@ c_due(a,flag) cilist *a;
        lunit = a->ciunit;
        if(not_legal(lunit)) err(errflag,F_ERUNIT,rdue+5);
        curunit = &units[lunit];
        lunit = a->ciunit;
        if(not_legal(lunit)) err(errflag,F_ERUNIT,rdue+5);
        curunit = &units[lunit];

-       if (!curunit->ufd && (n=fk_open(flag,DIR,UNF,(ftnint)lunit)) )
+       if (!curunit->ufd && (n=fk_open(flg,DIR,UNF,(ftnint)lunit)) )

                err(errflag,n,rdue+5)
        cf = curunit->ufd;
        elist = YES;
                err(errflag,n,rdue+5)
        cf = curunit->ufd;
        elist = YES;

diff --git a/usr/src/usr.bin/f77/libI77/sue.c b/usr/src/usr.bin/f77/libI77/sue.c
index 2fe9c7d..b33bda9 100644 (file)
--- a/usr/src/usr.bin/f77/libI77/sue.c
+++ b/usr/src/usr.bin/f77/libI77/sue.c
@@ -3,7 +3,7 @@
  * All rights reserved.  The Berkeley software License Agreement
  * specifies the terms and conditions for redistribution.
  *
  * All rights reserved.  The Berkeley software License Agreement
  * specifies the terms and conditions for redistribution.
  *

- *     @(#)sue.c       5.1     %G%
+ *     @(#)sue.c       5.2     %G%

  */
 
 /*
  */
 
 /*


@@ -47,7 +47,7 @@ s_wsue(a) cilist *a;
 }
 
 LOCAL
 }
 
 LOCAL

-c_sue(a,flag) cilist *a;
+c_sue(a,flg) cilist *a;

 {      int n;
        external = sequential = YES;
        formatted = NO;
 {      int n;
        external = sequential = YES;
        formatted = NO;


@@ -58,7 +58,7 @@ c_sue(a,flag) cilist *a;
        lunit = a->ciunit;
        if(not_legal(lunit)) err(errflag,F_ERUNIT,rsue+5)
        curunit = &units[lunit];
        lunit = a->ciunit;
        if(not_legal(lunit)) err(errflag,F_ERUNIT,rsue+5)
        curunit = &units[lunit];

-       if(!curunit->ufd && (n=fk_open(flag,SEQ,UNF,(ftnint)lunit)))
+       if(!curunit->ufd && (n=fk_open(flg,SEQ,UNF,(ftnint)lunit)))

                err(errflag,n,rsue+5)
        cf = curunit->ufd;
        elist = YES;
                err(errflag,n,rsue+5)
        cf = curunit->ufd;
        elist = YES;