ANSIfication

SCCS-vsn: games/hack/hack.tty.c 5.2
SCCS-vsn: old/pcc/lint/lpass2/lpass2.c 1.10
SCCS-vsn: usr.bin/diff/diff/diffreg.c 4.18
SCCS-vsn: bin/ed/ed.c 4.6

diff --git a/usr/src/bin/ed/ed.c b/usr/src/bin/ed/ed.c
index da3a98e..e8e27f2 100644 (file)
--- a/usr/src/bin/ed/ed.c
+++ b/usr/src/bin/ed/ed.c
@@ -1,5 +1,5 @@
 #ifndef lint
 #ifndef lint

-static char sccsid[] = "@(#)ed.c       4.5.1.1 (Berkeley) %G%";
+static char sccsid[] = "@(#)ed.c       4.6 (Berkeley) %G%";

 #endif
 
 /*
 #endif
 
 /*


@@ -66,7 +66,7 @@ int   col;
 char   *globp;
 int    tfile   = -1;
 int    tline;
 char   *globp;
 int    tfile   = -1;
 int    tline;

-char   *tfname;
+char   tfname[] = "/tmp/eXXXXX";

 char   *loc1;
 char   *loc2;
 char   *locs;
 char   *loc1;
 char   *loc2;
 char   *locs;


@@ -135,7 +135,7 @@ char **argv;
                globp = "r";
        }
        zero = (int *)malloc(nlall*sizeof(int));
                globp = "r";
        }
        zero = (int *)malloc(nlall*sizeof(int));

-       tfname = mktemp("/tmp/eXXXXX");
+       mktemp(tfname);

        init();
        if (((int)oldintr&01) == 0)
                signal(SIGINT, onintr);
        init();
        if (((int)oldintr&01) == 0)
                signal(SIGINT, onintr);

diff --git a/usr/src/games/hack/hack.tty.c b/usr/src/games/hack/hack.tty.c
index 1ee34b2..7cf2f01 100644 (file)
--- a/usr/src/games/hack/hack.tty.c
+++ b/usr/src/games/hack/hack.tty.c
@@ -16,7 +16,7 @@
  */
 
 #ifndef lint
  */
 
 #ifndef lint

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

 #endif /* not lint */
 
 /* Copyright (c) Stichting Mathematisch Centrum, Amsterdam, 1985. */
 #endif /* not lint */
 
 /* Copyright (c) Stichting Mathematisch Centrum, Amsterdam, 1985. */


@@ -258,7 +258,7 @@ register int c;
 char *
 parse()
 {
 char *
 parse()
 {

-       static char inline[COLNO];
+       static char inputline[COLNO];

        register foo;
 
        flags.move = 1;
        register foo;
 
        flags.move = 1;


@@ -267,23 +267,23 @@ parse()
                multi = 10*multi+foo-'0';
        if(multi) {
                multi--;
                multi = 10*multi+foo-'0';
        if(multi) {
                multi--;

-               save_cm = inline;
+               save_cm = inputline;

        }
        }

-       inline[0] = foo;
-       inline[1] = 0;
+       inputline[0] = foo;
+       inputline[1] = 0;

        if(foo == 'f' || foo == 'F'){
        if(foo == 'f' || foo == 'F'){

-               inline[1] = getchar();
+               inputline[1] = getchar();

 #ifdef QUEST
 #ifdef QUEST

-               if(inline[1] == foo) inline[2] = getchar(); else
+               if(inputline[1] == foo) inputline[2] = getchar(); else

 #endif QUEST
 #endif QUEST

-               inline[2] = 0;
+               inputline[2] = 0;

        }
        if(foo == 'm' || foo == 'M'){
        }
        if(foo == 'm' || foo == 'M'){

-               inline[1] = getchar();
-               inline[2] = 0;
+               inputline[1] = getchar();
+               inputline[2] = 0;

        }
        clrlin();
        }
        clrlin();

-       return(inline);
+       return(inputline);

 }
 
 char
 }
 
 char

diff --git a/usr/src/old/pcc/lint/lpass2/lpass2.c b/usr/src/old/pcc/lint/lpass2/lpass2.c
index 88f2472..1900f2f 100644 (file)
--- a/usr/src/old/pcc/lint/lpass2/lpass2.c
+++ b/usr/src/old/pcc/lint/lpass2/lpass2.c
@@ -1,5 +1,5 @@
 #ifndef lint
 #ifndef lint

-static char sccsid[] = "@(#)lpass2.c   1.9     (Berkeley)      %G%";
+static char sccsid[] = "@(#)lpass2.c   1.10    (Berkeley)      %G%";

 #endif lint
 
 # include "macdefs.h"
 #endif lint
 
 # include "macdefs.h"


@@ -525,7 +525,7 @@ chktype( pt1, pt2, fno ) register ATYPE *pt1, *pt2; {
        return( pt1->aty != pt2->aty );
        }
 
        return( pt1->aty != pt2->aty );
        }
 

-struct tb { int m; char * nm };
+struct tb { int m; char *nm; };

 
 struct tb dfs[] = {
        LDI, "LDI",
 
 struct tb dfs[] = {
        LDI, "LDI",

diff --git a/usr/src/usr.bin/diff/diff/diffreg.c b/usr/src/usr.bin/diff/diff/diffreg.c
index 926e377..fe3b870 100644 (file)
--- a/usr/src/usr.bin/diff/diff/diffreg.c
+++ b/usr/src/usr.bin/diff/diff/diffreg.c
@@ -1,4 +1,4 @@
-static char sccsid[] = "@(#)diffreg.c 4.17 %G%";
+static char sccsid[] = "@(#)diffreg.c 4.18 %G%";

 
 #include "diff.h"
 /*
 
 #include "diff.h"
 /*