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 b16bb41..e317d90 100644 (file)
--- a/usr/src/old/as.vax/asexpr.c
+++ b/usr/src/old/as.vax/asexpr.c
@@ -1,10 +1,13 @@
 /*
 /*

- *     Copyright (c) 1982 Regents of the University of California
+ * Copyright (c) 1982 Regents of the University of California.
+ * All rights reserved.  The Berkeley software License Agreement
+ * specifies the terms and conditions for redistribution.

  */
  */

-#ifndef lint
-static char sccsid[] = "@(#)asexpr.c 4.4 %G%";

 
 

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

 #endif not lint
 #endif not lint

+

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


@@ -329,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;


@@ -426,7 +429,6 @@ struct Tok_Desc tok_desc[] = {
        ILINESKIP,      CNTRL,  "skip lines",
        VOID,           CNTRL,  "void",
        SKIP,           CNTRL,  "skip",
        ILINESKIP,      CNTRL,  "skip lines",
        VOID,           CNTRL,  "void",
        SKIP,           CNTRL,  "skip",

-       NEEDSBUF,       CNTRL,  "need scanner buffer",

        NL,             CNTRL,  "new line",
        SCANEOF,        CNTRL,  "scanner end of file",
        BADCHAR,        CNTRL,  "bad character",
        NL,             CNTRL,  "new line",
        SCANEOF,        CNTRL,  "scanner end of file",
        BADCHAR,        CNTRL,  "bad character",


@@ -497,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 {