merge in onyx changes

SCCS-vsn: usr.bin/pascal/pxp/const.c 1.2
SCCS-vsn: usr.bin/pascal/pxp/error.c 1.3
SCCS-vsn: usr.bin/pascal/pxp/pmon.c 1.2
SCCS-vsn: usr.bin/pascal/pxp/stat.c 1.2
SCCS-vsn: usr.bin/pascal/pxp/type.c 1.2
SCCS-vsn: usr.bin/pascal/pxp/var.c 1.2
SCCS-vsn: usr.bin/pascal/pxp/yyput.c 1.2

diff --git a/usr/src/usr.bin/pascal/pxp/const.c b/usr/src/usr.bin/pascal/pxp/const.c
index 98e854f..c2eb1eb 100644 (file)
--- a/usr/src/usr.bin/pascal/pxp/const.c
+++ b/usr/src/usr.bin/pascal/pxp/const.c
@@ -1,4 +1,4 @@
-static char *sccsid = "@(#)const.c     1.1 (Berkeley) %G%";
+static char *sccsid = "@(#)const.c     1.2 (Berkeley) %G%";

 /* Copyright (c) 1979 Regents of the University of California */
 #
 /*
 /* Copyright (c) 1979 Regents of the University of California */
 #
 /*


@@ -11,7 +11,7 @@ static        char *sccsid = "@(#)const.c     1.1 (Berkeley) %G%";
 #include "0.h"
 #include "tree.h"
 
 #include "0.h"
 #include "tree.h"
 

-STATIC int constcnt -1;
+STATIC int constcnt = -1;

 
 /*
  * The const declaration part
 
 /*
  * The const declaration part

diff --git a/usr/src/usr.bin/pascal/pxp/error.c b/usr/src/usr.bin/pascal/pxp/error.c
index be1b708..cf95979 100644 (file)
--- a/usr/src/usr.bin/pascal/pxp/error.c
+++ b/usr/src/usr.bin/pascal/pxp/error.c
@@ -1,4 +1,4 @@
-static char *sccsid = "@(#)error.c     1.2 (Berkeley) %G%";
+static char *sccsid = "@(#)error.c     1.3 (Berkeley) %G%";

 /* Copyright (c) 1979 Regents of the University of California */
 /*
  * pi - Pascal interpreter code translator
 /* Copyright (c) 1979 Regents of the University of California */
 /*
  * pi - Pascal interpreter code translator


@@ -21,7 +21,7 @@ extern        int yyline;
 extern char errout;
 #endif
 
 extern char errout;
 #endif
 

-char   errpfx  'E';
+char   errpfx  = 'E';

 extern int yyline;
 /*
  * Panic is called when impossible
 extern int yyline;
 /*
  * Panic is called when impossible

diff --git a/usr/src/usr.bin/pascal/pxp/pmon.c b/usr/src/usr.bin/pascal/pxp/pmon.c
index cc3779b..8d745b7 100644 (file)
--- a/usr/src/usr.bin/pascal/pxp/pmon.c
+++ b/usr/src/usr.bin/pascal/pxp/pmon.c
@@ -1,4 +1,4 @@
-static char *sccsid = "@(#)pmon.c      1.1 (Berkeley) %G%";
+static char *sccsid = "@(#)pmon.c      1.2 (Berkeley) %G%";

 /* Copyright (c) 1979 Regents of the University of California */
 #
 /*
 /* Copyright (c) 1979 Regents of the University of California */
 #
 /*


@@ -81,7 +81,7 @@ getpmon(fp)
        return;
 }
 
        return;
 }
 

-STATIC char nospcm[]   "Not enough memory for count buffers\n";
+STATIC char nospcm[]   = "Not enough memory for count buffers\n";

 
 pmnospac()
 {
 
 pmnospac()
 {


@@ -178,7 +178,7 @@ pmread()
        if (cp == -1)
                pmnospac();
        i -= sizeof(zmagic);
        if (cp == -1)
                pmnospac();
        i -= sizeof(zmagic);

-       if (read(zfil, zbuf + (sizeof(zmagic) / sizeof(zbuf)), i) != i)
+       if (read(zfil, zbuf + (sizeof(zmagic) / sizeof(*zbuf)), i) != i)

                return (-1);
        zbuf++;
        return (0);
                return (-1);
        zbuf++;
        return (0);


@@ -342,7 +342,7 @@ shudpcnt()
        return (i == 0);
 }
 
        return (i == 0);
 }
 

-STATIC char mism[]     "Program and counter data do not correspond\n";
+STATIC char mism[]     = "Program and counter data do not correspond\n";

 
 cPANIC()
 {
 
 cPANIC()
 {

diff --git a/usr/src/usr.bin/pascal/pxp/stat.c b/usr/src/usr.bin/pascal/pxp/stat.c
index b7111d9..393c1a3 100644 (file)
--- a/usr/src/usr.bin/pascal/pxp/stat.c
+++ b/usr/src/usr.bin/pascal/pxp/stat.c
@@ -1,4 +1,4 @@
-static char *sccsid = "@(#)stat.c      1.1 (Berkeley) %G%";
+static char *sccsid = "@(#)stat.c      1.2 (Berkeley) %G%";

 /* Copyright (c) 1979 Regents of the University of California */
 #
 /*
 /* Copyright (c) 1979 Regents of the University of California */
 #
 /*


@@ -12,7 +12,7 @@ static        char *sccsid = "@(#)stat.c      1.1 (Berkeley) %G%";
 #include "tree.h"
 
 int cntstat;
 #include "tree.h"
 
 int cntstat;

-int cnts 3;
+int cnts = 3;

 
 statlist(r)
        int *r;
 
 statlist(r)
        int *r;

diff --git a/usr/src/usr.bin/pascal/pxp/type.c b/usr/src/usr.bin/pascal/pxp/type.c
index 1aaf4c1..80fff35 100644 (file)
--- a/usr/src/usr.bin/pascal/pxp/type.c
+++ b/usr/src/usr.bin/pascal/pxp/type.c
@@ -1,4 +1,4 @@
-static char *sccsid = "@(#)type.c      1.1 (Berkeley) %G%";
+static char *sccsid = "@(#)type.c      1.2 (Berkeley) %G%";

 /* Copyright (c) 1979 Regents of the University of California */
 #
 /*
 /* Copyright (c) 1979 Regents of the University of California */
 #
 /*


@@ -11,7 +11,7 @@ static        char *sccsid = "@(#)type.c      1.1 (Berkeley) %G%";
 #include "0.h"
 #include "tree.h"
 
 #include "0.h"
 #include "tree.h"
 

-STATIC int typecnt -1;
+STATIC int typecnt = -1;

 /*
  * Type declaration part
  */
 /*
  * Type declaration part
  */

diff --git a/usr/src/usr.bin/pascal/pxp/var.c b/usr/src/usr.bin/pascal/pxp/var.c
index 2ef4388..5a9325b 100644 (file)
--- a/usr/src/usr.bin/pascal/pxp/var.c
+++ b/usr/src/usr.bin/pascal/pxp/var.c
@@ -1,4 +1,4 @@
-static char *sccsid = "@(#)var.c       1.1 (Berkeley) %G%";
+static char *sccsid = "@(#)var.c       1.2 (Berkeley) %G%";

 /* Copyright (c) 1979 Regents of the University of California */
 #
 /*
 /* Copyright (c) 1979 Regents of the University of California */
 #
 /*


@@ -11,7 +11,7 @@ static        char *sccsid = "@(#)var.c       1.1 (Berkeley) %G%";
 #include "0.h"
 #include "tree.h"
 
 #include "0.h"
 #include "tree.h"
 

-STATIC int varcnt -1;
+STATIC int varcnt = -1;

 /*
  * Var declaration part
  */
 /*
  * Var declaration part
  */

diff --git a/usr/src/usr.bin/pascal/pxp/yyput.c b/usr/src/usr.bin/pascal/pxp/yyput.c
index 85281b4..fa23bfa 100644 (file)
--- a/usr/src/usr.bin/pascal/pxp/yyput.c
+++ b/usr/src/usr.bin/pascal/pxp/yyput.c
@@ -1,4 +1,4 @@
-static char *sccsid = "@(#)yyput.c     1.1 (Berkeley) %G%";
+static char *sccsid = "@(#)yyput.c     1.2 (Berkeley) %G%";

 /* Copyright (c) 1979 Regents of the University of California */
 #
 /*
 /* Copyright (c) 1979 Regents of the University of California */
 #
 /*


@@ -100,7 +100,7 @@ yyoutfl(toseqid)
        }
 }
 \f
        }
 }
 \f

-int    yygetunit -1;
+int    yygetunit = -1;

 char   *yygetfile;
 
 /*
 char   *yygetfile;
 
 /*


@@ -234,7 +234,7 @@ graphic(ch)
 \f
 extern int nopflg;
 
 \f
 extern int nopflg;
 

-char   printed 1;
+char   printed = 1;

 /*
  * Set the current file name to be file,
  * printing the name, or a header on a new
 /*
  * Set the current file name to be file,
  * printing the name, or a header on a new