ANSIfication

SCCS-vsn: old/prof/prof.c 4.5
SCCS-vsn: lib/libplot/aed/open.c 5.2
SCCS-vsn: old/tbl/t..c 4.4
SCCS-vsn: old/tbl/t6.c 4.4
SCCS-vsn: old/tbl/t8.c 4.3
SCCS-vsn: old/tbl/tb.c 4.4
SCCS-vsn: old/tbl/tu.c 4.3
SCCS-vsn: usr.bin/window/lcmd.c 3.29
SCCS-vsn: usr.bin/colcrt/colcrt.c 5.2
SCCS-vsn: usr.bin/tset/tset.c 5.12
SCCS-vsn: usr.bin/error/touch.c 5.4
SCCS-vsn: old/refer/refer/refer5.c 4.9
SCCS-vsn: old/roff/nroff_term/code.aj833 4.2
SCCS-vsn: old/roff/nroff_term/code.itoh 4.2
SCCS-vsn: old/roff/nroff_term/tab37.c 4.2
SCCS-vsn: old/roff/nroff_term/tabepson.c 1.3
SCCS-vsn: old/roff/nroff_term/tabnec25-t.c 4.2
SCCS-vsn: old/roff/nroff_term/tabqume.c 4.2
SCCS-vsn: old/roff/nroff_term/tabqume12.c 4.2

diff --git a/usr/src/lib/libplot/aed/open.c b/usr/src/lib/libplot/aed/open.c
index 93dede4..30d9bb8 100644 (file)
--- a/usr/src/lib/libplot/aed/open.c
+++ b/usr/src/lib/libplot/aed/open.c
@@ -10,7 +10,7 @@ static char sccsid[] = "@(#)open.c    4.1 (Berkeley) 11/11/83";
 
 char dbuf[BUFSIZ];     /* Used to buffer display characters */
 struct sgttyb sgttyb;  /* Used to save terminal control bits */
 
 char dbuf[BUFSIZ];     /* Used to buffer display characters */
 struct sgttyb sgttyb;  /* Used to save terminal control bits */

-curx, cury;            /* Current screen position */
+int curx, cury;                /* Current screen position */

 int xbot, ybot;                /* Coordinates of screen lower-left corner */
 int scale;             /* The number of pixels per 2**12 units
                         * of world coordinates.
 int xbot, ybot;                /* Coordinates of screen lower-left corner */
 int scale;             /* The number of pixels per 2**12 units
                         * of world coordinates.

diff --git a/usr/src/old/prof/prof.c b/usr/src/old/prof/prof.c
index ae4415b..444d227 100644 (file)
--- a/usr/src/old/prof/prof.c
+++ b/usr/src/old/prof/prof.c
@@ -1,5 +1,5 @@
 #ifndef lint
 #ifndef lint

-static char *sccsid = "@(#)prof.c      4.4 (Berkeley) %G%";
+static char *sccsid = "@(#)prof.c      4.5 (Berkeley) %G%";

 #endif
 /*
  * prof
 #endif
 /*
  * prof


@@ -10,7 +10,7 @@ static        char *sccsid = "@(#)prof.c      4.4 (Berkeley) %G%";
 #include <a.out.h>
 #include <sys/time.h>
 
 #include <a.out.h>
 #include <sys/time.h>
 

-typedef        short UNIT;             /* unit of profiling */
+typedef        unsigned short UNIT;            /* unit of profiling */

 #define        PCFUDGE         11
 #define        A_OUTNAME       "a.out"
 #define        MON_OUTNAME     "mon.out"
 #define        PCFUDGE         11
 #define        A_OUTNAME       "a.out"
 #define        MON_OUTNAME     "mon.out"


@@ -54,7 +54,7 @@ struct cnt {
  * Each discretized pc sample has
  * a count of the number of samples in its range
  */
  * Each discretized pc sample has
  * a count of the number of samples in its range
  */

-unsigned UNIT  *samples;
+UNIT   *samples;

 
 FILE   *pfile, *nfile;
 
 
 FILE   *pfile, *nfile;
 


@@ -309,7 +309,7 @@ openpfile(filename)
        highpc = h.highpc - (UNIT *)0;
        sampbytes =
            stb.st_size - sizeof(struct hdr) - h.ncount*sizeof(struct cnt);
        highpc = h.highpc - (UNIT *)0;
        sampbytes =
            stb.st_size - sizeof(struct hdr) - h.ncount*sizeof(struct cnt);

-       nsamples = sampbytes / sizeof (unsigned UNIT);
+       nsamples = sampbytes / sizeof (UNIT);

 }
 
 closepfile()
 }
 
 closepfile()


@@ -378,20 +378,20 @@ asgncntrs()
 readsamples()
 {
        register i;
 readsamples()
 {
        register i;

-       unsigned UNIT   sample;
+       UNIT    sample;

        int totalt;
        
        if (samples == 0) {
        int totalt;
        
        if (samples == 0) {

-               samples = (unsigned UNIT *)
-                   calloc(sampbytes, sizeof (unsigned UNIT));
+               samples = (UNIT *)
+                   calloc(sampbytes, sizeof (UNIT));

                if (samples == 0) {
                        printf("prof: No room for %d sample pc's\n", 
                if (samples == 0) {
                        printf("prof: No room for %d sample pc's\n", 

-                           sampbytes / sizeof (unsigned UNIT));
+                           sampbytes / sizeof (UNIT));

                        done();
                }
        }
        for (i = 0; ; i++) {
                        done();
                }
        }
        for (i = 0; ; i++) {

-               fread(&sample, sizeof (unsigned UNIT), 1, pfile);
+               fread(&sample, sizeof (UNIT), 1, pfile);

                if (feof(pfile))
                        break;
                samples[i] += sample;
                if (feof(pfile))
                        break;
                samples[i] += sample;


@@ -411,7 +411,7 @@ readsamples()
 asgnsamples()
 {
        register j;
 asgnsamples()
 {
        register j;

-       unsigned UNIT   ccnt;
+       UNIT    ccnt;

        double time;
        unsigned pcl, pch;
        register int i;
        double time;
        unsigned pcl, pch;
        register int i;


@@ -478,7 +478,7 @@ putprof()
        fwrite(&h, sizeof (struct hdr), 1, sfile);
        for (np = nl; np < npe-1; np++) {
                if (np->ncall > 0) {
        fwrite(&h, sizeof (struct hdr), 1, sfile);
        for (np = nl; np < npe-1; np++) {
                if (np->ncall > 0) {

-                       kp.cvalue = np->value * sizeof (unsigned UNIT);
+                       kp.cvalue = np->value * sizeof (UNIT);

                        kp.cncall = np->ncall;
                        fwrite(&kp, sizeof (struct cnt), 1, sfile);
                }
                        kp.cncall = np->ncall;
                        fwrite(&kp, sizeof (struct cnt), 1, sfile);
                }


@@ -486,7 +486,7 @@ putprof()
        kp.cvalue = 0;
        kp.cncall = 0;
        fwrite(&kp, sizeof (struct cnt), 1, sfile);
        kp.cvalue = 0;
        kp.cncall = 0;
        fwrite(&kp, sizeof (struct cnt), 1, sfile);

-       fwrite(samples, sizeof (unsigned UNIT), nsamples, sfile);
+       fwrite(samples, sizeof (UNIT), nsamples, sfile);

        fclose(sfile);
 }
 
        fclose(sfile);
 }
 


@@ -582,7 +582,7 @@ plotprof()
        scale = (4080.*ransca)/(sampbytes/sizeof(UNIT));
        lastsx = 0.0;
        for(i = 0; i < nsamples; i++) {
        scale = (4080.*ransca)/(sampbytes/sizeof(UNIT));
        lastsx = 0.0;
        for(i = 0; i < nsamples; i++) {

-               unsigned UNIT ccnt;
+               UNIT ccnt;

                double tx, ty;
                ccnt = samples[i];
                time = ccnt;
                double tx, ty;
                ccnt = samples[i];
                time = ccnt;

diff --git a/usr/src/old/refer/refer/refer5.c b/usr/src/old/refer/refer/refer5.c
index 6c3a010..24443ab 100644 (file)
--- a/usr/src/old/refer/refer/refer5.c
+++ b/usr/src/old/refer/refer/refer5.c
@@ -1,5 +1,5 @@
 #ifndef lint
 #ifndef lint

-static char *sccsid = "@(#)refer5.c    4.8 (Berkeley) %G%";
+static char *sccsid = "@(#)refer5.c    4.9 (Berkeley) %G%";

 #endif
 
 #include "refer..c"
 #endif
 
 #include "refer..c"


@@ -105,7 +105,7 @@ char *flds[], *nstline, *endline;
        }
        if (bare == 0) {
                if (!another) {
        }
        if (bare == 0) {
                if (!another) {

-                       sprintf(t1, "%s%s\%s\n", stline, sig, endline);
+                       sprintf(t1, "%s%s%s\n", stline, sig, endline);

                        if (strlen(t1) > MXSIG)
                                err("t1 overflow (%d)", MXSIG);
                        append(t1);
                        if (strlen(t1) > MXSIG)
                                err("t1 overflow (%d)", MXSIG);
                        append(t1);

diff --git a/usr/src/old/roff/nroff_term/code.aj833 b/usr/src/old/roff/nroff_term/code.aj833
index abf0098..eda4451 100644 (file)
--- a/usr/src/old/roff/nroff_term/code.aj833
+++ b/usr/src/old/roff/nroff_term/code.aj833
@@ -1,4 +1,4 @@
-/*     code.aj833      4.1     83/08/05        */
+/*     code.aj833      4.2     88/07/22        */

 "\001 ",       /*space*/
 "\001!",       /*!*/
 "\001\"",      /*"*/
 "\001 ",       /*space*/
 "\001!",       /*!*/
 "\001\"",      /*"*/


@@ -120,7 +120,7 @@
 "\000\0",              /*half narrow space*/
 "\001 ",               /*unpaddable space*/
 "\001\241c\202(\241",                  /*alpha*/
 "\000\0",              /*half narrow space*/
 "\001 ",               /*unpaddable space*/
 "\001\241c\202(\241",                  /*alpha*/

-"\001\200B\242\301\|\202\341",         /*beta*/
+"\001\200B\242\301|\202\341",          /*beta*/

 "\001\200)\201/\241",                  /*gamma*/
 "\001\200o\342<\302",                  /*delta*/
 "\001<\b-",                            /*epsilon*/
 "\001\200)\201/\241",                  /*gamma*/
 "\001\200o\342<\302",                  /*delta*/
 "\001<\b-",                            /*epsilon*/

diff --git a/usr/src/old/roff/nroff_term/code.itoh b/usr/src/old/roff/nroff_term/code.itoh
index f367d4d..d41e906 100644 (file)
--- a/usr/src/old/roff/nroff_term/code.itoh
+++ b/usr/src/old/roff/nroff_term/code.itoh
@@ -1,4 +1,4 @@
-/*     code.itoh       4.1     83/08/05        */
+/*     code.itoh       4.2     88/07/22        */

 /* terminal driver codes for the C.Itoh Prowriter */
 /* codetab */
 "\001 ",       /*space*/
 /* terminal driver codes for the C.Itoh Prowriter */
 /* codetab */
 "\001 ",       /*space*/


@@ -103,7 +103,7 @@
 "\001-",         /*3/4 em dash*/
 "\001\033X \033Y",        /*rule--should properly be up one unit*/
 "\001\033\046N\033\044",    /*1/4*/
 "\001-",         /*3/4 em dash*/
 "\001\033X \033Y",        /*rule--should properly be up one unit*/
 "\001\033\046N\033\044",    /*1/4*/

-"\001\033\046\M\033\044",    /*1/2*/
+"\001\033\046M\033\044",    /*1/2*/

 "\0033/4",      /*3/4*/
 "\001-",        /*minus*/
 "\202fi",       /*fi*/
 "\0033/4",      /*3/4*/
 "\001-",        /*minus*/
 "\202fi",       /*fi*/

diff --git a/usr/src/old/roff/nroff_term/tab37.c b/usr/src/old/roff/nroff_term/tab37.c
index 748f35b..2b206d4 100644 (file)
--- a/usr/src/old/roff/nroff_term/tab37.c
+++ b/usr/src/old/roff/nroff_term/tab37.c
@@ -1,4 +1,4 @@
-/*     tab37.c 4.1     83/08/05        */
+/*     tab37.c 4.2     88/07/22        */

 #define INCH 240
 /*
  * Model 37 TeleType
 #define INCH 240
 /*
  * Model 37 TeleType


@@ -155,7 +155,7 @@ struct {
 "\000\0",      /*narrow sp*/
 "\001-",        /*hyphen*/
 "\001o\b+",     /*bullet*/
 "\000\0",      /*narrow sp*/
 "\001-",        /*hyphen*/
 "\001o\b+",     /*bullet*/

-"\002\[]",      /*square*/
+"\002[]",       /*square*/

 "\001-",        /*3/4 em*/
 "\001_",        /*rule*/
 "\0031/4",     /*1/4*/
 "\001-",        /*3/4 em*/
 "\001_",        /*rule*/
 "\0031/4",     /*1/4*/

diff --git a/usr/src/old/roff/nroff_term/tabepson.c b/usr/src/old/roff/nroff_term/tabepson.c
index cb22f9e..04b3e1f 100644 (file)
--- a/usr/src/old/roff/nroff_term/tabepson.c
+++ b/usr/src/old/roff/nroff_term/tabepson.c
@@ -177,7 +177,7 @@ struct {
 "\001",                /* narrow sp */
 "\001-",       /*hyphen*/
 "\001\033j\003.\033J\003",     /*bullet*/
 "\001",                /* narrow sp */
 "\001-",       /*hyphen*/
 "\001\033j\003.\033J\003",     /*bullet*/

-"\002\[]",     /*square*/
+"\002[]",      /*square*/

 "\001-",       /*3/4 em*/
 "\001_",       /*rule*/
 "\0031/4",     /*1/4*/
 "\001-",       /*3/4 em*/
 "\001_",       /*rule*/
 "\0031/4",     /*1/4*/

diff --git a/usr/src/old/roff/nroff_term/tabnec25-t.c b/usr/src/old/roff/nroff_term/tabnec25-t.c
index 2881593..a13022e 100644 (file)
--- a/usr/src/old/roff/nroff_term/tabnec25-t.c
+++ b/usr/src/old/roff/nroff_term/tabnec25-t.c
@@ -1,4 +1,4 @@
-/*     tabnec25-t.c    4.1     86/04/03        */
+/*     tabnec25-t.c    4.2     88/07/22        */

 #define INCH 240
 /*
 NEC Spinwriter 7725 and 5525 (Diablo replacements)
 #define INCH 240
 /*
 NEC Spinwriter 7725 and 5525 (Diablo replacements)


@@ -157,7 +157,7 @@ struct {
 "\000\0",      /*narrow sp*/
 "\001-",       /*hyphen*/
 "\001O\b+",    /*bullet*/
 "\000\0",      /*narrow sp*/
 "\001-",       /*hyphen*/
 "\001O\b+",    /*bullet*/

-"\002\[]",     /*square*/
+"\002[]",      /*square*/

 "\001-",       /*3/4 em*/
 "\001_",       /*rule*/
 "\2031/4",     /*1/4*/
 "\001-",       /*3/4 em*/
 "\001_",       /*rule*/
 "\2031/4",     /*1/4*/

diff --git a/usr/src/old/roff/nroff_term/tabqume.c b/usr/src/old/roff/nroff_term/tabqume.c
index 4accd29..b2e0072 100644 (file)
--- a/usr/src/old/roff/nroff_term/tabqume.c
+++ b/usr/src/old/roff/nroff_term/tabqume.c
@@ -1,4 +1,4 @@
-/*     tabqume.c       4.1     83/08/05        */
+/*     tabqume.c       4.2     88/07/22        */

 #define INCH 240
 /*
  * QUME 10 Pitch
 #define INCH 240
 /*
  * QUME 10 Pitch


@@ -149,7 +149,7 @@ struct {
 "\201y",       /*y*/
 "\201z",       /*z*/
 "\001[",       /*{*/
 "\201y",       /*y*/
 "\201z",       /*z*/
 "\001[",       /*{*/

-"\001\033\ ",  /*|*/
+"\001\033 ",   /*|*/

 "\001]",       /*}*/
 "\000\0",      /*~*/
 "\000\0",      /*narrow sp*/
 "\001]",       /*}*/
 "\000\0",      /*~*/
 "\000\0",      /*narrow sp*/


@@ -248,14 +248,14 @@ struct {
 "\001+",       /*equation plus*/
 "\001\134",    /*registered*/
 "\001^",       /*copyright*/
 "\001+",       /*equation plus*/
 "\001\134",    /*registered*/
 "\001^",       /*copyright*/

-"\001\033\ ",  /*box rule */
+"\001\033 ",   /*box rule */

 "\001c\b/",    /*cent sign*/
 "\000\0",      /*dbl dagger*/
 "\000\0",      /*right hand*/
 "\000\0",      /*left hand*/
 "\001*",       /*math * */
 "\000\0",      /*bell system sign*/
 "\001c\b/",    /*cent sign*/
 "\000\0",      /*dbl dagger*/
 "\000\0",      /*right hand*/
 "\000\0",      /*left hand*/
 "\001*",       /*math * */
 "\000\0",      /*bell system sign*/

-"\001\033\ ",  /*or (was star)*/
+"\001\033 ",   /*or (was star)*/

 "\000\0",      /*circle*/
 "\000\0",      /*left top (of big curly)*/
 "\000\0",      /*left bottom*/
 "\000\0",      /*circle*/
 "\000\0",      /*left top (of big curly)*/
 "\000\0",      /*left bottom*/

diff --git a/usr/src/old/roff/nroff_term/tabqume12.c b/usr/src/old/roff/nroff_term/tabqume12.c
index 6f32676..5883d14 100644 (file)
--- a/usr/src/old/roff/nroff_term/tabqume12.c
+++ b/usr/src/old/roff/nroff_term/tabqume12.c
@@ -1,4 +1,4 @@
-/*     tabqume12.c     4.1     83/08/05        */
+/*     tabqume12.c     4.2     88/07/22        */

 #define INCH 240
 /*
  * QUME 12 Pitch
 #define INCH 240
 /*
  * QUME 12 Pitch


@@ -249,7 +249,7 @@ struct {
 "\000\0",      /*registered*/
 "\000\0",      /*copyright*/
 "\001|",       /*box rule */
 "\000\0",      /*registered*/
 "\000\0",      /*copyright*/
 "\001|",       /*box rule */

-"\001\033\ ",  /*cent sign*/
+"\001\033 ",   /*cent sign*/

 "\000\0",      /*dbl dagger*/
 "\000\0",      /*right hand*/
 "\000\0",      /*left hand*/
 "\000\0",      /*dbl dagger*/
 "\000\0",      /*right hand*/
 "\000\0",      /*left hand*/

diff --git a/usr/src/old/tbl/t..c b/usr/src/old/tbl/t..c
index ff1356f..89defb6 100644 (file)
--- a/usr/src/old/tbl/t..c
+++ b/usr/src/old/tbl/t..c
@@ -1,4 +1,4 @@
-/*     t..c    4.3     85/09/14        */
+/*     t..c    4.4     88/07/22        */

 
 /* t..c : external declarations */
 
 
 /* t..c : external declarations */
 


@@ -39,6 +39,8 @@ extern int textflg;
 extern int left1flg;
 extern int rightl;
 struct colstr {char *col, *rcol;};
 extern int left1flg;
 extern int rightl;
 struct colstr {char *col, *rcol;};

+/* FIXME: kludge for seeing if somebody stuffed a char into col or rcol. */
+# define tx(a) ((int)(a)>0 && (int)(a)<128)

 extern struct colstr *table[];
 extern char *cspace, *cstore;
 extern char *chspace();
 extern struct colstr *table[];
 extern char *cspace, *cstore;
 extern char *chspace();

diff --git a/usr/src/old/tbl/t6.c b/usr/src/old/tbl/t6.c
index 407c26f..2b4f602 100644 (file)
--- a/usr/src/old/tbl/t6.c
+++ b/usr/src/old/tbl/t6.c
@@ -1,10 +1,11 @@
 #ifndef lint
 #ifndef lint

-static char sccsid[] = "@(#)t6.c       4.3 %G%";
+static char sccsid[] = "@(#)t6.c       4.4 %G%";

 #endif
 
  /* t6.c: compute tab stops */
 #endif
 
  /* t6.c: compute tab stops */

-# define tx(a) (a>0 && a<128)
+

 # include "t..c"
 # include "t..c"

+

 maktab()
 {
 # define FN(i,c) font[stynum[i]][c]
 maktab()
 {
 # define FN(i,c) font[stynum[i]][c]


@@ -34,7 +35,7 @@ for(icol=0; icol <ncol; icol++)
                        case 'a':
                                acase[icol]=1;
                                s = table[ilin][icol].col;
                        case 'a':
                                acase[icol]=1;
                                s = table[ilin][icol].col;

-                               if (s>0 && s<128 && text)
+                               if (tx(s) && text)

                                        {
                                        if (doubled[icol]==0)
                                                fprintf(tabout, ".nr %d 0\n.nr %d 0\n",S1,S2);
                                        {
                                        if (doubled[icol]==0)
                                                fprintf(tabout, ".nr %d 0\n.nr %d 0\n",S1,S2);

diff --git a/usr/src/old/tbl/t8.c b/usr/src/old/tbl/t8.c
index bdaee0f..3d71812 100644 (file)
--- a/usr/src/old/tbl/t8.c
+++ b/usr/src/old/tbl/t8.c
@@ -1,5 +1,5 @@
 #ifndef lint
 #ifndef lint

-static char sccsid[] = "@(#)t8.c       4.2 %G%";
+static char sccsid[] = "@(#)t8.c       4.3 %G%";

 #endif
 
  /* t8.c: write out one line of output table */
 #endif
 
  /* t8.c: write out one line of output table */


@@ -28,7 +28,7 @@ for(c=0; c<ncol; c++)
                {
                for(ip=nl; ip<nlin; ip=next(ip))
                        if (!vspen(s=table[ip][c].col)) break;
                {
                for(ip=nl; ip<nlin; ip=next(ip))
                        if (!vspen(s=table[ip][c].col)) break;

-               if (s>0 && s<128)
+               if (tx(s))

                fprintf(tabout, ".ne \\n(%c|u+\\n(.Vu\n",s);
                continue;
                }
                fprintf(tabout, ".ne \\n(%c|u+\\n(.Vu\n",s);
                continue;
                }

diff --git a/usr/src/old/tbl/tb.c b/usr/src/old/tbl/tb.c
index 30508c9..e069e39 100644 (file)
--- a/usr/src/old/tbl/tb.c
+++ b/usr/src/old/tbl/tb.c
@@ -1,5 +1,5 @@
 #ifndef lint
 #ifndef lint

-static char sccsid[] = "@(#)tb.c       4.3 %G%";
+static char sccsid[] = "@(#)tb.c       4.4 %G%";

 #endif
 
  /* tb.c: check which entries exist, also storage allocation */
 #endif
 
  /* tb.c: check which entries exist, also storage allocation */


@@ -50,7 +50,7 @@ if (spvecs[spcount])
 if (spcount>=MAXVEC)
        error("Too many characters in table");
 spvecs[spcount++]= pp = calloc(MAXCHS+200,1);
 if (spcount>=MAXVEC)
        error("Too many characters in table");
 spvecs[spcount++]= pp = calloc(MAXCHS+200,1);

-if (pp== -1 || pp == 0)
+if (pp == 0)

        error("no space for characters");
 return(pp);
 }
        error("no space for characters");
 return(pp);
 }


@@ -71,7 +71,7 @@ if (tpcount<0 || thisvec+n > tpvecs[tpcount]+MAXCHS)
                tpvecs[tpcount] = calloc(MAXCHS,1);
                }
        thisvec = tpvecs[tpcount];
                tpvecs[tpcount] = calloc(MAXCHS,1);
                }
        thisvec = tpvecs[tpcount];

-       if (thisvec == -1)
+       if (thisvec == 0)

                error("no space for vectors");
        }
 tp=thisvec;
                error("no space for vectors");
        }
 tp=thisvec;

diff --git a/usr/src/old/tbl/tu.c b/usr/src/old/tbl/tu.c
index 42c0eb0..b65f39a 100644 (file)
--- a/usr/src/old/tbl/tu.c
+++ b/usr/src/old/tbl/tu.c
@@ -1,5 +1,5 @@
 #ifndef lint
 #ifndef lint

-static char sccsid[] = "@(#)tu.c       4.2 %G%";
+static char sccsid[] = "@(#)tu.c       4.3 %G%";

 #endif
 
  /* tu.c: draws horizontal lines */
 #endif
 
  /* tu.c: draws horizontal lines */


@@ -42,8 +42,8 @@ if (!pr1403)
 
 drawline(i, cl, cr, lintype, noheight, shortl)
 {
 
 drawline(i, cl, cr, lintype, noheight, shortl)
 {

-       char *exhr, *exhl;
-       int lcount, ln, linpos, oldpos, nodata, lnch;
+       char *exhr, *exhl, *lnch;
+       int lcount, ln, linpos, oldpos, nodata;

 lcount=0;
 exhr=exhl= "";
 switch(lintype)
 lcount=0;
 exhr=exhl= "";
 switch(lintype)

diff --git a/usr/src/usr.bin/colcrt/colcrt.c b/usr/src/usr.bin/colcrt/colcrt.c
index 2e4479c..006d518 100644 (file)
--- a/usr/src/usr.bin/colcrt/colcrt.c
+++ b/usr/src/usr.bin/colcrt/colcrt.c
@@ -11,7 +11,7 @@ char copyright[] =
 #endif not lint
 
 #ifndef lint
 #endif not lint
 
 #ifndef lint

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

 #endif not lint
 
 #include <stdio.h>
 #endif not lint
 
 #include <stdio.h>


@@ -68,8 +68,7 @@ main(argc, argv)
        do {
                if (argc > 0) {
                        close(0);
        do {
                if (argc > 0) {
                        close(0);

-                       if ((f=fopen(argv[0], "r")
-) < 0) {
+                       if (!(f = fopen(argv[0], "r"))) {

                                fflush(stdout);
                                perror(argv[0]);
                                exit (1);
                                fflush(stdout);
                                perror(argv[0]);
                                exit (1);

diff --git a/usr/src/usr.bin/error/touch.c b/usr/src/usr.bin/error/touch.c
index d5d3baf..1d183d8 100644 (file)
--- a/usr/src/usr.bin/error/touch.c
+++ b/usr/src/usr.bin/error/touch.c
@@ -16,7 +16,7 @@
  */
 
 #ifndef lint
  */
 
 #ifndef lint

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

 #endif /* not lint */
 
 #include <stdio.h>
 #endif /* not lint */
 
 #include <stdio.h>


@@ -609,7 +609,7 @@ writetouched(overwrite)
                        fclose(tmpfile);
        }
        if (oktorm == 0){
                        fclose(tmpfile);
        }
        if (oktorm == 0){

-               fprintf(stderr, "%s: Catastrophe: A copy of \"%s\: was saved in \"%s\"\n",
+               fprintf(stderr, "%s: Catastrophe: A copy of \"%s\": was saved in \"%s\"\n",

                        processname, o_name, n_name);
                exit(1);
        }
                        processname, o_name, n_name);
                exit(1);
        }

diff --git a/usr/src/usr.bin/tset/tset.c b/usr/src/usr.bin/tset/tset.c
index 0e9372a..90825df 100644 (file)
--- a/usr/src/usr.bin/tset/tset.c
+++ b/usr/src/usr.bin/tset/tset.c
@@ -22,7 +22,7 @@ char copyright[] =
 #endif /* not lint */
 
 #ifndef lint
 #endif /* not lint */
 
 #ifndef lint

-static char sccsid[] = "@(#)tset.c     5.11 (Berkeley) %G%";
+static char sccsid[] = "@(#)tset.c     5.12 (Berkeley) %G%";

 #endif /* not lint */
 
 /*
 #endif /* not lint */
 
 /*


@@ -1529,7 +1529,7 @@ char      def;
        else
                prs(" set to ");
        bufp = buf;
        else
                prs(" set to ");
        bufp = buf;

-       if (tgetstr("kb", &bufp) > 0 && n == buf[0] && buf[1] == NULL)
+       if (tgetstr("kb", &bufp) && n == buf[0] && buf[1] == NULL)

                prs("Backspace\n");
        else if (n == 0177)
                prs("Delete\n");
                prs("Backspace\n");
        else if (n == 0177)
                prs("Delete\n");

diff --git a/usr/src/usr.bin/window/lcmd.c b/usr/src/usr.bin/window/lcmd.c
index 3dc17f2..08d8e63 100644 (file)
--- a/usr/src/usr.bin/window/lcmd.c
+++ b/usr/src/usr.bin/window/lcmd.c
@@ -16,7 +16,7 @@
  */
 
 #ifndef lint
  */
 
 #ifndef lint

-static char sccsid[] = "@(#)lcmd.c     3.28 (Berkeley) %G%";
+static char sccsid[] = "@(#)lcmd.c     3.29 (Berkeley) %G%";

 #endif /* not lint */
 
 #include "defs.h"
 #endif /* not lint */
 
 #include "defs.h"


@@ -65,7 +65,7 @@ extern struct lcmd_arg arg_unalias[];
 extern struct lcmd_arg arg_unset[];
 extern struct lcmd_arg arg_window[];
 extern struct lcmd_arg arg_write[];
 extern struct lcmd_arg arg_unset[];
 extern struct lcmd_arg arg_window[];
 extern struct lcmd_arg arg_write[];

-struct lcmd_arg arg_null[] = 0;
+struct lcmd_arg arg_null[];

 
 struct lcmd_tab lcmd_tab[] = {
        "alias",        1,      l_alias,        arg_alias,
 
 struct lcmd_tab lcmd_tab[] = {
        "alias",        1,      l_alias,        arg_alias,