cleanup from Chris Torek

[unix-history] / usr / src / old / as.vax / asexpr.c

diff --git a/usr/src/old/as.vax/asexpr.c b/usr/src/old/as.vax/asexpr.c
index 94ebfc0..e317d90 100644 (file)
--- a/usr/src/old/as.vax/asexpr.c
+++ b/usr/src/old/as.vax/asexpr.c
@@ -5,10 +5,9 @@
  */
 
 #ifndef lint
  */
 
 #ifndef lint

-static char sccsid[] = "@(#)asexpr.c   5.1 (Berkeley) %G%";
+static char sccsid[] = "@(#)asexpr.c   5.4 (Berkeley) %G%";

 #endif not lint
 
 #endif not lint
 

-#endif not lint

 #include <stdio.h>
 #include "as.h"
 #include "asscan.h"
 #include <stdio.h>
 #include "as.h"
 #include "asscan.h"


@@ -333,7 +332,7 @@ struct exp *yukkyexpr(val, np)
                lastnam = (struct symtab *)np;
                /* FALLTHROUGH */
        case NAME:
                lastnam = (struct symtab *)np;
                /* FALLTHROUGH */
        case NAME:

-               exprisname++;
+               exprisname = (int) np;

                locxp->e_xtype = ((struct symtab *)np)->s_type;
                if (( ((struct symtab *)np)->s_type&XTYPE)==XUNDEF) { /*forward*/
                        locxp->e_xname = (struct symtab *)np;
                locxp->e_xtype = ((struct symtab *)np)->s_type;
                if (( ((struct symtab *)np)->s_type&XTYPE)==XUNDEF) { /*forward*/
                        locxp->e_xname = (struct symtab *)np;


@@ -500,7 +499,7 @@ char *tok_to_name(token)
                fixed = 1;
        }
        if (FIRSTTOKEN <= token && token <= LASTTOKEN){
                fixed = 1;
        }
        if (FIRSTTOKEN <= token && token <= LASTTOKEN){

-               sprintf(buf, "%s %s", tok_name[token]->tok_kind,
+               (void)sprintf(buf, "%s %s", tok_name[token]->tok_kind,

                        tok_name[token]->tok_name);
                return(buf);
        } else {
                        tok_name[token]->tok_name);
                return(buf);
        } else {