ignore & before array

[unix-history] / usr / src / old / tbl / t5.c

diff --git a/usr/src/old/tbl/t5.c b/usr/src/old/tbl/t5.c
index 5a9d389..4abb706 100644 (file)
--- a/usr/src/old/tbl/t5.c
+++ b/usr/src/old/tbl/t5.c
@@ -1,4 +1,6 @@
-/*     t5.c    4.1     83/02/12        */
+#ifndef lint
+static char sccsid[] = "@(#)t5.c       4.3 %G%";
+#endif

 
  /* t5.c: read data for table */
 # include "t..c"
 
  /* t5.c: read data for table */
 # include "t..c"


@@ -22,7 +24,7 @@ for (nlin=nslin=0; gets1(cstore); nlin++)
                }
        if (nlin>=MAXLIN)
                {
                }
        if (nlin>=MAXLIN)
                {

-               leftover=cstore;
+               leftover=(int)cstore;

                break;
                }
        fullbot[nlin]=0;
                break;
                }
        fullbot[nlin]=0;


@@ -39,9 +41,10 @@ for (nlin=nslin=0; gets1(cstore); nlin++)
                        fullbot[nlin]= ch;
                nlin++;
                nslin++;
                        fullbot[nlin]= ch;
                nlin++;
                nslin++;

-               instead[nlin]=fullbot[nlin]=0;
+               instead[nlin]=(char *)0;
+               fullbot[nlin]=0;

                }
                }

-       table[nlin] = alocv((ncol+2)*sizeof(table[0][0]));
+       table[nlin] = (struct colstr *)alocv((ncol+2)*sizeof(table[0][0]));

        if (cstore[1]==0)
        switch(cstore[0])
                {
        if (cstore[1]==0)
        switch(cstore[0])
                {


@@ -57,7 +60,7 @@ for (nlin=nslin=0; gets1(cstore); nlin++)
                ch=1;
                if (match(cstore, "T{")) /* text follows */
                        table[nlin][icol].col =
                ch=1;
                if (match(cstore, "T{")) /* text follows */
                        table[nlin][icol].col =

-                               gettext(cstore, nlin, icol,
+                               (char *)gettext(cstore, nlin, icol,

                                        font[stynum[nlin]][icol],
                                        csize[stynum[nlin]][icol]);
                else
                                        font[stynum[nlin]][icol],
                                        csize[stynum[nlin]][icol]);
                else


@@ -68,7 +71,8 @@ for (nlin=nslin=0; gets1(cstore); nlin++)
                        switch(ctype(nlin,icol)) /* numerical or alpha, subcol */
                                {
                                case 'n':
                        switch(ctype(nlin,icol)) /* numerical or alpha, subcol */
                                {
                                case 'n':

-                                       table[nlin][icol].rcol = maknew(table[nlin][icol].col);
+                                       table[nlin][icol].rcol = 
+                                           (char *)maknew(table[nlin][icol].col);

                                        break;
                                case 'a':
                                        table[nlin][icol].rcol = table[nlin][icol].col;
                                        break;
                                case 'a':
                                        table[nlin][icol].rcol = table[nlin][icol].col;