alloc is gone, use pcalloc()

[unix-history] / usr / src / usr.bin / pascal / pxp / pmon.c

diff --git a/usr/src/usr.bin/pascal/pxp/pmon.c b/usr/src/usr.bin/pascal/pxp/pmon.c
index cc3779b..45c10e3 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      2.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()
 {


@@ -171,14 +171,14 @@ pmread()
        ptvec = zmagic.tim;
        zcnt = zmagic.cntrs;
        zpfcnt = zmagic.rtns;
        ptvec = zmagic.tim;
        zcnt = zmagic.cntrs;
        zpfcnt = zmagic.rtns;

-       cp = zbuf = alloc(i = (zcnt + 1) * sizeof *zbuf);
+       cp = zbuf = pcalloc(i = (zcnt + 1) * sizeof *zbuf, 1);

        if (cp == -1)
                pmnospac();
        if (cp == -1)
                pmnospac();

-       cp = zpf = alloc(zpfcnt * sizeof *zpf);
+       cp = zpf = pcalloc(zpfcnt * sizeof *zpf, 1);

        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()
 {