merge lint by thien

SCCS-vsn: usr.bin/pascal/src/stat.c 1.13
SCCS-vsn: usr.bin/pascal/src/stab.c 1.10

diff --git a/usr/src/usr.bin/pascal/src/stab.c b/usr/src/usr.bin/pascal/src/stab.c
index 49b0f6c..58529a7 100644 (file)
--- a/usr/src/usr.bin/pascal/src/stab.c
+++ b/usr/src/usr.bin/pascal/src/stab.c
@@ -1,7 +1,7 @@
 /* Copyright (c) 1980 Regents of the University of California */
 
 #ifndef lint
 /* Copyright (c) 1980 Regents of the University of California */
 
 #ifndef lint

-static char sccsid[] = "@(#)stab.c 1.8.1.1 %G%";
+static char sccsid[] = "@(#)stab.c 1.10 %G%";

 #endif
 
     /*
 #endif
 
     /*


@@ -197,19 +197,19 @@ stabsource(filename)
         *      for separate compilation
         */
     putprintf("        .stabs  \"%s\",0x%x,0,0x%x,0x%x", 0,
         *      for separate compilation
         */
     putprintf("        .stabs  \"%s\",0x%x,0,0x%x,0x%x", 0,

-           filename, N_PC, N_PSO, N_FLAGCHECKSUM);
+           (int) filename, N_PC, N_PSO, N_FLAGCHECKSUM);

        /*
         *      for sdb
         */
     if ( ! opt('g') ) {
            return;
     }
        /*
         *      for sdb
         */
     if ( ! opt('g') ) {
            return;
     }

-    label = getlab();
+    label = (int) getlab();

     putprintf( "       .stabs  \"" , 1 );
     putprintf( "       .stabs  \"" , 1 );

-    putprintf( NAMEFORMAT , 1 , filename );
+    putprintf( NAMEFORMAT , 1 , (int) filename );

     putprintf( "\",0x%x,0,0," , 1 , N_SO );
     putprintf( "\",0x%x,0,0," , 1 , N_SO );

-    putprintf( PREFIXFORMAT , 0 , LLABELPREFIX , label );
-    putprintf( PREFIXFORMAT , 1 , LLABELPREFIX , label );
+    putprintf( PREFIXFORMAT , 0 , (int) LLABELPREFIX , label );
+    putprintf( PREFIXFORMAT , 1 , (int) LLABELPREFIX , label );

     putprintf( ":" , 0 );
 }
 
     putprintf( ":" , 0 );
 }
 


@@ -222,7 +222,7 @@ stabinclude(filename, firsttime)
     char       *filename;
     bool       firsttime;
 {
     char       *filename;
     bool       firsttime;
 {

-    int        label;
+    int                label;

     long       check;
     
        /*
     long       check;
     
        /*


@@ -234,19 +234,18 @@ stabinclude(filename, firsttime)
        check = N_FLAGCHECKSUM;
     }
     putprintf("        .stabs  \"%s\",0x%x,0,0x%x,0x%x", 0,
        check = N_FLAGCHECKSUM;
     }
     putprintf("        .stabs  \"%s\",0x%x,0,0x%x,0x%x", 0,

-           filename, N_PC, N_PSOL, check);
+           (int) filename, N_PC, N_PSOL, check);

        /*
         *      for sdb
         */
     if ( ! opt('g') ) {
            return;
     }
        /*
         *      for sdb
         */
     if ( ! opt('g') ) {
            return;
     }

-    label = getlab();
-    putprintf( "       .stabs  \"" , 1 );
-    putprintf( NAMEFORMAT , 1 , filename );
+    label = (int) getlab();
+    putprintf( NAMEFORMAT , 1 , (int) filename );

     putprintf( "\",0x%x,0,0," , 1 , N_SOL );
     putprintf( "\",0x%x,0,0," , 1 , N_SOL );

-    putprintf( PREFIXFORMAT , 0 , LLABELPREFIX , label );
-    putprintf( PREFIXFORMAT , 1 , LLABELPREFIX , label );
+    putprintf( PREFIXFORMAT , 0 , (int) LLABELPREFIX , label );
+    putprintf( PREFIXFORMAT , 1 , (int) LLABELPREFIX , label );

     putprintf( ":" , 0 );
 }
 
     putprintf( ":" , 0 );
 }
 

diff --git a/usr/src/usr.bin/pascal/src/stat.c b/usr/src/usr.bin/pascal/src/stat.c
index 3688a16..66bf24c 100644 (file)
--- a/usr/src/usr.bin/pascal/src/stat.c
+++ b/usr/src/usr.bin/pascal/src/stat.c
@@ -1,7 +1,7 @@
 /* Copyright (c) 1979 Regents of the University of California */
 
 #ifndef lint
 /* Copyright (c) 1979 Regents of the University of California */
 
 #ifndef lint

-static char sccsid[] = "@(#)stat.c 1.11.1.1 %G%";
+static char sccsid[] = "@(#)stat.c 1.13 %G%";

 #endif
 
 #include "whoami.h"
 #endif
 
 #include "whoami.h"


@@ -245,7 +245,6 @@ withop(s)
                     *  since we have to use it before we know its type;
                     *  but we use its runtime location for the with pointer.
                     */
                     *  since we have to use it before we know its type;
                     *  but we use its runtime location for the with pointer.
                     */

-               tempnlp = tmpalloc(sizeof(int *), nl + TPTR, REGOK);

 #              ifdef OBJ
                    (void) put(2, O_LV | cbn <<8+INDX, tempnlp -> value[ NL_OFFS ] );
 #              endif OBJ
 #              ifdef OBJ
                    (void) put(2, O_LV | cbn <<8+INDX, tempnlp -> value[ NL_OFFS ] );
 #              endif OBJ