consistent typing

SCCS-vsn: usr.bin/f77/libF77/trapov_.c 5.5
SCCS-vsn: usr.bin/f77/libF77/trpfpe_.c 5.6

diff --git a/usr/src/usr.bin/f77/libF77/trapov_.c b/usr/src/usr.bin/f77/libF77/trapov_.c
index 1aeb830..6fd7cdd 100644 (file)
--- a/usr/src/usr.bin/f77/libF77/trapov_.c
+++ b/usr/src/usr.bin/f77/libF77/trapov_.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.
  *

- *     @(#)trapov_.c   5.4     %G%
+ *     @(#)trapov_.c   5.5     %G%

  *
  *     Fortran/C floating-point overflow handler
  *
  *
  *     Fortran/C floating-point overflow handler
  *


@@ -159,6 +159,7 @@ trapov_(count, rtnval)
  */
 
 /*ARGSUSED*/
  */
 
 /*ARGSUSED*/

+void

 got_overflow(signo, codeword, myaddr, pc, ps)
        char *myaddr, *pc;
 {
 got_overflow(signo, codeword, myaddr, pc, ps)
        char *myaddr, *pc;
 {


@@ -226,6 +227,7 @@ ovcnt_()
  */
 
 /*ARGSUSED*/
  */
 
 /*ARGSUSED*/

+void

 got_illegal_instruction(signo, codeword, myaddr, trap_pc, ps)
        char *myaddr, *trap_pc;
 {
 got_illegal_instruction(signo, codeword, myaddr, trap_pc, ps)
        char *myaddr, *trap_pc;
 {


@@ -240,9 +242,10 @@ got_illegal_instruction(signo, codeword, myaddr, trap_pc, ps)
        opcode = fetch_byte() & 0xff;
        no_reserved = 0;
        if (codeword != RES_OPR_F || !is_floating_operation(opcode)) {
        opcode = fetch_byte() & 0xff;
        no_reserved = 0;
        if (codeword != RES_OPR_F || !is_floating_operation(opcode)) {

-               if (sigill_default > (SIG_VAL)7)
-                       return((*sigill_default)(signo, codeword, myaddr, trap_pc, ps));
-               else
+               if (sigill_default > (SIG_VAL)7) {
+                       (*sigill_default)(signo, codeword, myaddr, trap_pc, ps);
+                       return;
+               } else

                        sigdie(signo, codeword, myaddr, trap_pc, ps);
                        /* NOTREACHED */
        }
                        sigdie(signo, codeword, myaddr, trap_pc, ps);
                        /* NOTREACHED */
        }

diff --git a/usr/src/usr.bin/f77/libF77/trpfpe_.c b/usr/src/usr.bin/f77/libF77/trpfpe_.c
index e497240..2b3edf4 100644 (file)
--- a/usr/src/usr.bin/f77/libF77/trpfpe_.c
+++ b/usr/src/usr.bin/f77/libF77/trpfpe_.c
@@ -4,7 +4,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.
  *

- *     @(#)trpfpe_.c   5.5     %G%
+ *     @(#)trpfpe_.c   5.6     %G%

  *
  *
  *     Fortran floating-point error handler
  *
  *
  *     Fortran floating-point error handler


@@ -148,7 +148,7 @@ static union {
 static int     max_messages    = 1;            /* the user can tell us */
 static int     fpe_count       = 0;            /* how bad is it ? */
        long    fpeflt_         = 0;    /* fortran "common /fpeflt/ flag" */
 static int     max_messages    = 1;            /* the user can tell us */
 static int     fpe_count       = 0;            /* how bad is it ? */
        long    fpeflt_         = 0;    /* fortran "common /fpeflt/ flag" */

-static int     (*sigfpe_dfl)() = SIG_DFL;      /* if we can't fix it ... */
+static sig_t   sigfpe_dfl      = SIG_DFL;      /* if we can't fix it ... */

 
 /*
  * The fortran unit control table
 
 /*
  * The fortran unit control table