modern syntax for asgops & inits cause Donn's latest ccom rejects the old.
authorJay Lepreau <lepreau@ucbvax.Berkeley.EDU>
Mon, 16 Feb 1987 13:05:08 +0000 (05:05 -0800)
committerJay Lepreau <lepreau@ucbvax.Berkeley.EDU>
Mon, 16 Feb 1987 13:05:08 +0000 (05:05 -0800)
SCCS-vsn: local/sccscmds/sccscmds.2/cmd/bdiff.c 4.3
SCCS-vsn: local/sccscmds/sccscmds.ok/cmd/bdiff.c 4.3
SCCS-vsn: local/sccscmds/sccscmds.2/cmd/cmt.c 4.4
SCCS-vsn: local/sccscmds/sccscmds.ok/cmd/cmt.c 4.4
SCCS-vsn: local/sccscmds/sccscmds.2/cmd/comb.c 4.3
SCCS-vsn: local/sccscmds/sccscmds.ok/cmd/comb.c 4.3
SCCS-vsn: local/sccscmds/sccscmds.2/cmd/get.c 4.8
SCCS-vsn: local/sccscmds/sccscmds.ok/cmd/get.c 4.8
SCCS-vsn: local/sccscmds/sccscmds.2/cmd/help.c 4.2
SCCS-vsn: local/sccscmds/sccscmds.ok/cmd/help.c 4.2
SCCS-vsn: local/sccscmds/sccscmds.2/cmd/prt.c 4.2
SCCS-vsn: local/sccscmds/sccscmds.ok/cmd/prt.c 4.2
SCCS-vsn: local/sccscmds/sccscmds.2/cmd/rmchg.c 4.3
SCCS-vsn: local/sccscmds/sccscmds.ok/cmd/rmchg.c 4.3
SCCS-vsn: local/sccscmds/sccscmds.2/cmd/snull.c 4.4
SCCS-vsn: local/sccscmds/sccscmds.ok/cmd/snull.c 4.4
SCCS-vsn: local/sccscmds/sccscmds.2/cmd/val.c 4.3
SCCS-vsn: local/sccscmds/sccscmds.ok/cmd/val.c 4.3
SCCS-vsn: local/sccscmds/sccscmds.2/cmd/delta.c 4.8
SCCS-vsn: local/sccscmds/sccscmds.ok/cmd/delta.c 4.8
SCCS-vsn: local/sccscmds/sccscmds.2/cmd/prs.c 4.2
SCCS-vsn: local/sccscmds/sccscmds.ok/cmd/prs.c 4.2
SCCS-vsn: local/sccscmds/sccscmds.2/cmd/admin.c 4.2
SCCS-vsn: local/sccscmds/sccscmds.ok/cmd/admin.c 4.2

24 files changed:
usr/src/local/sccscmds/sccscmds.2/cmd/admin.c
usr/src/local/sccscmds/sccscmds.2/cmd/bdiff.c
usr/src/local/sccscmds/sccscmds.2/cmd/cmt.c
usr/src/local/sccscmds/sccscmds.2/cmd/comb.c
usr/src/local/sccscmds/sccscmds.2/cmd/delta.c
usr/src/local/sccscmds/sccscmds.2/cmd/get.c
usr/src/local/sccscmds/sccscmds.2/cmd/help.c
usr/src/local/sccscmds/sccscmds.2/cmd/prs.c
usr/src/local/sccscmds/sccscmds.2/cmd/prt.c
usr/src/local/sccscmds/sccscmds.2/cmd/rmchg.c
usr/src/local/sccscmds/sccscmds.2/cmd/snull.c
usr/src/local/sccscmds/sccscmds.2/cmd/val.c
usr/src/local/sccscmds/sccscmds.ok/cmd/admin.c
usr/src/local/sccscmds/sccscmds.ok/cmd/bdiff.c
usr/src/local/sccscmds/sccscmds.ok/cmd/cmt.c
usr/src/local/sccscmds/sccscmds.ok/cmd/comb.c
usr/src/local/sccscmds/sccscmds.ok/cmd/delta.c
usr/src/local/sccscmds/sccscmds.ok/cmd/get.c
usr/src/local/sccscmds/sccscmds.ok/cmd/help.c
usr/src/local/sccscmds/sccscmds.ok/cmd/prs.c
usr/src/local/sccscmds/sccscmds.ok/cmd/prt.c
usr/src/local/sccscmds/sccscmds.ok/cmd/rmchg.c
usr/src/local/sccscmds/sccscmds.ok/cmd/snull.c
usr/src/local/sccscmds/sccscmds.ok/cmd/val.c

index 0fa982f..07d5d91 100644 (file)
@@ -1,7 +1,7 @@
 # include "../hdr/defines.h"
 # include "../hdr/had.h"
 
 # include "../hdr/defines.h"
 # include "../hdr/had.h"
 
-SCCSID(@(#)admin.c     4.1);
+static char Sccsid[] = "@(#)admin.c    4.2     %G%";
 
 /*
        Program to create new SCCS files and change parameters
 
 /*
        Program to create new SCCS files and change parameters
@@ -33,9 +33,9 @@ char *ifile, *tfile;
 char *z;       /* for validation program name */
 char had[26], had_flag[26], rm_flag[26];
 char   *Comments, *Mrs;
 char *z;       /* for validation program name */
 char had[26], had_flag[26], rm_flag[26];
 char   *Comments, *Mrs;
-char Valpgm[]          "/usr/local/val";
+char Valpgm[] = "/usr/local/val";
 int irel, fexists, num_files;
 int irel, fexists, num_files;
-int    VFLAG   0;
+int    VFLAG = 0;
 int    Domrs;
 char *Sflags[];
 char *anames[MAXNAMES], *enames[MAXNAMES];
 int    Domrs;
 char *Sflags[];
 char *anames[MAXNAMES], *enames[MAXNAMES];
@@ -232,8 +232,8 @@ char *argv[];
        Change flags for 'fatal' so that it will return to this
        routine (main) instead of terminating processing.
        */
        Change flags for 'fatal' so that it will return to this
        routine (main) instead of terminating processing.
        */
-       Fflags =& ~FTLEXIT;
-       Fflags =| FTLJMP;
+       Fflags &= ~FTLEXIT;
+       Fflags |= FTLJMP;
 
        /*
        Call 'admin' routine for each file argument.
 
        /*
        Call 'admin' routine for each file argument.
@@ -514,7 +514,7 @@ char *afile;
 
                        gpkt.p_wrttn = 1;       /* don't write previous line */
 
 
                        gpkt.p_wrttn = 1;       /* don't write previous line */
 
-                       cp =+ 2;        /* point to flag character */
+                       cp += 2;        /* point to flag character */
                        k = *cp - 'a';
 
                        if (!had_flag[k] && !rm_flag[k]) {
                        k = *cp - 'a';
 
                        if (!had_flag[k] && !rm_flag[k]) {
index 8e68f5e..63c20af 100644 (file)
@@ -1,6 +1,6 @@
 # include "../hdr/defines.h"
 
 # include "../hdr/defines.h"
 
-SCCSID(@(#)bdiff.c     4.2);
+static char Sccsid[] = "@(#)bdiff.c    4.3     %G%";
 
 /*
        This program segments two files into pieces of <= seglim lines
 
 /*
        This program segments two files into pieces of <= seglim lines
@@ -22,8 +22,8 @@ SCCSID(@(#)bdiff.c    4.2);
 
 int seglim;    /* limit of size of file segment to be generated */
 
 
 int seglim;    /* limit of size of file segment to be generated */
 
-char diff[]    "/bin/diff";
-char tempskel[] "/tmp/bdXXXXX";                /* used to generate temp file names */
+char diff[] = "/bin/diff";
+char tempskel[] = "/tmp/bdXXXXX";              /* used to generate temp file names */
 char tempfile[32];
 char otmp[32], ntmp[32];
 int linenum;
 char tempfile[32];
 char otmp[32], ntmp[32];
 int linenum;
@@ -66,13 +66,13 @@ char *argv[];
 
        if (argc > 3) {
                if (argv[3][0] == '-' && argv[3][1] == 's')
 
        if (argc > 3) {
                if (argv[3][0] == '-' && argv[3][1] == 's')
-                       Fflags =& ~FTLMSG;
+                       Fflags &= ~FTLMSG;
                else {
                        if ((seglim = patoi(argv[3])) == -1)
                                fatal("non-numeric limit (bd4)");
                        if (argc == 5 && argv[4][0] == '-' &&
                                        argv[4][1] == 's')
                else {
                        if ((seglim = patoi(argv[3])) == -1)
                                fatal("non-numeric limit (bd4)");
                        if (argc == 5 && argv[4][0] == '-' &&
                                        argv[4][1] == 's')
-                               Fflags =& ~FTLMSG;
+                               Fflags &= ~FTLMSG;
                }
        }
 
                }
        }
 
@@ -226,7 +226,7 @@ char *argv[];
                        if (status&~0x100)
                                fatal(sprintf(Error,"'%s' failed (bd6)",diff));
                }
                        if (status&~0x100)
                                fatal(sprintf(Error,"'%s' failed (bd6)",diff));
                }
-               linenum =+ seglim;
+               linenum += seglim;
 
                /*
                Remove temporary files.
 
                /*
                Remove temporary files.
@@ -300,7 +300,7 @@ char *lp;
 
                default:
                        lp = satoi(lp,&num);
 
                default:
                        lp = satoi(lp,&num);
-                       num =+ linenum;
+                       num += linenum;
                        printf("%d",num);
                }
        }
                        printf("%d",num);
                }
        }
index 990a22e..5a9c63a 100644 (file)
@@ -1,7 +1,7 @@
 # include      "../hdr/defines.h"
 # include      "../hdr/had.h"
 
 # include      "../hdr/defines.h"
 # include      "../hdr/had.h"
 
-SCCSID(@(#)cmt.c       4.3);
+static char Sccsid[] = "@(#)cmt.c      4.4     %G%";
 
 struct packet gpkt;
 int    num_files, had_ffile;
 
 struct packet gpkt;
 int    num_files, had_ffile;
@@ -9,7 +9,7 @@ int     F_Opened, Opened, Domrs, First;
 char   *Comments, *Mrs, *ffile;
 char   Cstr[BUFSIZ], Mstr[BUFSIZ], Line[BUFSIZ], had[26];
 FILE   *iop, *Xiop;
 char   *Comments, *Mrs, *ffile;
 char   Cstr[BUFSIZ], Mstr[BUFSIZ], Line[BUFSIZ], had[26];
 FILE   *iop, *Xiop;
-static char    ifde[]  "initial file does not exists";
+static char ifde[] = "initial file does not exists";
 
 main(argc,argv)
 int argc;
 
 main(argc,argv)
 int argc;
@@ -58,8 +58,8 @@ register char *argv[];
        Reset flags for 'fatal' so that it will return to 'main'
        rather than exiting.
        */
        Reset flags for 'fatal' so that it will return to 'main'
        rather than exiting.
        */
-       Fflags =& ~FTLEXIT;
-       Fflags =| FTLJMP;
+       Fflags &= ~FTLEXIT;
+       Fflags |= FTLJMP;
 
        /*
        Invoke 'cmt' for each file argument. 
 
        /*
        Invoke 'cmt' for each file argument. 
@@ -72,9 +72,9 @@ register char *argv[];
 }
 
 
 }
 
 
-static char s_warn[] "WARNING: MR flag is set; `%s' should contain both MR line and comment line\n";
+static char s_warn[] "WARNING: MR flag is set; `%s' should contain both MR line and comment line\n";
 
 
-static char ns_warn[] "WARNING: MR flag is not set; `%s' should only contain comment line\n";
+static char ns_warn[] "WARNING: MR flag is not set; `%s' should only contain comment line\n";
 
 cmt(file)
 register char *file;
 
 cmt(file)
 register char *file;
@@ -158,13 +158,13 @@ register char *file;
 }
 
 
 }
 
 
-static char    cle[]   "comment line for initial delta already exists";
+static char cle[] = "comment line for initial delta already exists";
 
 do_delt(pkt)
 register struct packet *pkt;
 {
        int     n;
 
 do_delt(pkt)
 register struct packet *pkt;
 {
        int     n;
-       int     did_zero 0;
+       int     did_zero 0;
        struct deltab dt;
        struct stats stats;
 
        struct deltab dt;
        struct stats stats;
 
index 96ec1ec..2e743cd 100644 (file)
@@ -1,7 +1,7 @@
 # include      "../hdr/defines.h"
 # include      "../hdr/had.h"
 
 # include      "../hdr/defines.h"
 # include      "../hdr/had.h"
 
-SCCSID(@(#)comb.c      4.2);
+static char Sccsid[] = "@(#)comb.c     4.3     %G%";
 USXALLOC();
 
 struct packet gpkt;
 USXALLOC();
 
 struct packet gpkt;
@@ -68,8 +68,8 @@ register char *argv[];
        if (HADP && HADC)
                fatal("can't have both -p and -c (cb2)");
        setsig();
        if (HADP && HADC)
                fatal("can't have both -p and -c (cb2)");
        setsig();
-       Fflags =& ~FTLEXIT;
-       Fflags =| FTLJMP;
+       Fflags &= ~FTLEXIT;
+       Fflags |= FTLJMP;
        iop = stdout;
        for (i = 1; i < argc; i++)
                if (p=argv[i])
        iop = stdout;
        for (i = 1; i < argc; i++)
                if (p=argv[i])
index 5473eec..f10a6e5 100644 (file)
@@ -1,7 +1,7 @@
 # include      "../hdr/defines.h"
 # include      "../hdr/had.h"
 
 # include      "../hdr/defines.h"
 # include      "../hdr/had.h"
 
-SCCSID(@(#)delta.c     4.7);
+static char Sccsid[] = "@(#)delta.c    4.8     %G%";
 USXALLOC();
 
 # ifdef LOGDELTA
 USXALLOC();
 
 # ifdef LOGDELTA
@@ -11,7 +11,7 @@ FILE  *Logf;
 
 char   Diffpgm[] = "/usr/local/bdiff";
 FILE   *Diffin;
 
 char   Diffpgm[] = "/usr/local/bdiff";
 FILE   *Diffin;
-int    Debug   0;
+int    Debug = 0;
 struct packet gpkt;
 struct sid sid;
 int    num_files;
 struct packet gpkt;
 struct sid sid;
 int    num_files;
@@ -89,8 +89,8 @@ register char *argv[];
        Logf = fopen(LogFile, "a");
 # endif
        setsig();
        Logf = fopen(LogFile, "a");
 # endif
        setsig();
-       Fflags =& ~FTLEXIT;
-       Fflags =| FTLJMP;
+       Fflags &= ~FTLEXIT;
+       Fflags |= FTLJMP;
        for (i=1; i<argc; i++)
                if (p=argv[i])
                        do_file(p,delta);
        for (i=1; i<argc; i++)
                if (p=argv[i])
                        do_file(p,delta);
@@ -105,7 +105,7 @@ register char *argv[];
 delta(file)
 char *file;
 {
 delta(file)
 char *file;
 {
-       static int first 1;
+       static int first 1;
        register char *p;
        int n, linenum;
        char type;
        register char *p;
        int n, linenum;
        char type;
@@ -199,11 +199,11 @@ char *file;
                Diffin = dodiff(auxf(gpkt.p_file,'g'),dfilename,difflim);
                while (n = getdiff(&type,&linenum)) {
                        if (type == INS) {
                Diffin = dodiff(auxf(gpkt.p_file,'g'),dfilename,difflim);
                while (n = getdiff(&type,&linenum)) {
                        if (type == INS) {
-                               inserted =+ n;
+                               inserted += n;
                                insert(&gpkt,linenum,n,newser);
                        }
                        else {
                                insert(&gpkt,linenum,n,newser);
                        }
                        else {
-                               deleted =+ n;
+                               deleted += n;
                                delete(&gpkt,linenum,n,newser);
                        }
                }
                                delete(&gpkt,linenum,n,newser);
                        }
                }
index 3c9e13b..df0b225 100644 (file)
@@ -4,16 +4,16 @@
 # include      "../hdr/had.h"
 # include      <sys/dir.h>
 
 # include      "../hdr/had.h"
 # include      <sys/dir.h>
 
-SCCSID(@(#)get.c       4.7);
+static char Sccsid[] = "@(#)get.c      4.8     %G%";
 
 
-int    Debug   0;
+int    Debug = 0;
 struct packet gpkt;
 struct sid sid;
 unsigned       Ser;
 int    num_files;
 char   had[26];
 char   *ilist, *elist, *lfile;
 struct packet gpkt;
 struct sid sid;
 unsigned       Ser;
 int    num_files;
 char   had[26];
 char   *ilist, *elist, *lfile;
-long   cutoff  0X7FFFFFFFL;    /* max positive long */
+long   cutoff = 0X7FFFFFFFL;   /* max positive long */
 int verbosity;
 char   Gfile[MAXNAMLEN + 3];
 char   Mod[MAXNAMLEN + 3];             /* should be as large as Gfile? */
 int verbosity;
 char   Gfile[MAXNAMLEN + 3];
 char   Mod[MAXNAMLEN + 3];             /* should be as large as Gfile? */
@@ -113,8 +113,8 @@ register char *argv[];
        if (!HADS)
                verbosity = -1;
        setsig();
        if (!HADS)
                verbosity = -1;
        setsig();
-       Fflags =& ~FTLEXIT;
-       Fflags =| FTLJMP;
+       Fflags &= ~FTLEXIT;
+       Fflags |= FTLJMP;
        for (i=1; i<argc; i++)
                if (p=argv[i])
                        do_file(p,get);
        for (i=1; i<argc; i++)
                if (p=argv[i])
                        do_file(p,get);
@@ -242,7 +242,7 @@ int branch;
 
        chkbr = 0;
        if (pkt->p_reqsid.s_br == 0) {
 
        chkbr = 0;
        if (pkt->p_reqsid.s_br == 0) {
-               pkt->p_reqsid.s_lev =+ 1;
+               pkt->p_reqsid.s_lev += 1;
                if (sidtoser(&pkt->p_reqsid,pkt) ||
                        pkt->p_maxr > pkt->p_reqsid.s_rel || branch) {
                                pkt->p_reqsid.s_rel = pkt->p_gotsid.s_rel;
                if (sidtoser(&pkt->p_reqsid,pkt) ||
                        pkt->p_maxr > pkt->p_reqsid.s_rel || branch) {
                                pkt->p_reqsid.s_rel = pkt->p_gotsid.s_rel;
@@ -255,16 +255,16 @@ int branch;
        else if (pkt->p_reqsid.s_seq == 0 && !branch)
                pkt->p_reqsid.s_seq = pkt->p_gotsid.s_seq + 1;
        else {
        else if (pkt->p_reqsid.s_seq == 0 && !branch)
                pkt->p_reqsid.s_seq = pkt->p_gotsid.s_seq + 1;
        else {
-               pkt->p_reqsid.s_seq =+ 1;
+               pkt->p_reqsid.s_seq += 1;
                if (branch || sidtoser(&pkt->p_reqsid,pkt)) {
                if (branch || sidtoser(&pkt->p_reqsid,pkt)) {
-                       pkt->p_reqsid.s_br =+ 1;
+                       pkt->p_reqsid.s_br += 1;
                        pkt->p_reqsid.s_seq = 1;
                        chkbr++;
                }
        }
        if (chkbr)
                while (sidtoser(&pkt->p_reqsid,pkt))
                        pkt->p_reqsid.s_seq = 1;
                        chkbr++;
                }
        }
        if (chkbr)
                while (sidtoser(&pkt->p_reqsid,pkt))
-                       pkt->p_reqsid.s_br =+ 1;
+                       pkt->p_reqsid.s_br += 1;
        if (sidtoser(&pkt->p_reqsid,pkt))
                fatal("internal error in newsid()");
 }
        if (sidtoser(&pkt->p_reqsid,pkt))
                fatal("internal error in newsid()");
 }
@@ -477,7 +477,7 @@ register char *old, *new;
        *new = '\0';
 }
 
        *new = '\0';
 }
 
-static char Zkeywd[5]  "@(#)";
+static char Zkeywd[5] = "@(#)";
 
 
 idsubst(pkt,line)
 
 
 idsubst(pkt,line)
index c60604b..5e3f7c9 100644 (file)
@@ -1,6 +1,6 @@
 # include      "../hdr/defines.h"
 
 # include      "../hdr/defines.h"
 
-SCCSID(@(#)help.c      4.1);
+static char Sccsid[] = "@(#)help.c     4.2     %G%";
 
 /*
        Program to locate helpful info in an ascii file.
 
 /*
        Program to locate helpful info in an ascii file.
@@ -39,8 +39,8 @@ SCCSID(@(#)help.c     4.1);
 
        If the argument is omitted, the program requests it.
 */
 
        If the argument is omitted, the program requests it.
 */
-char   oldfile[]       "/usr/local/lib/sccs.hf";
-char   helpdir[]       "/usr/local/lib/help/";
+char   oldfile[] = "/usr/local/lib/sccs.hf";
+char   helpdir[] = "/usr/local/lib/help/";
 char   hfile[64];
 FILE   *iop;
 char   line [512];
 char   hfile[64];
 FILE   *iop;
 char   line [512];
index 78d6ca5..9c31246 100644 (file)
 # include "../hdr/defines.h"
 # include "../hdr/had.h"
 
 # include "../hdr/defines.h"
 # include "../hdr/had.h"
 
-SCCSID(@(#)prs.c       4.1);
+static char Sccsid[] = "@(#)prs.c      4.2     %G%";
 
 char   had[26];
 
 char   had[26];
-char   Getpgm[]        "/usr/local/get";
+char   Getpgm[] = "/usr/local/get";
 char   Sid[32];
 char   Mod[16];
 char   *Type;
 char   Deltadate[18];
 char   *Deltatime;
 char   Sid[32];
 char   Mod[16];
 char   *Type;
 char   Deltadate[18];
 char   *Deltatime;
-char   tempskel[]      "/tmp/prXXXXXX";        /* used to generate temp
-                                                  file names
-                                               */
+char   tempskel[] = "/tmp/prXXXXXX";   /* used to generate temp file names */
+
 char   untmp[32], uttmp[32], cmtmp[32];
 char   mrtmp[32], bdtmp[32];
 FILE   *UNiop;
 char   untmp[32], uttmp[32], cmtmp[32];
 char   mrtmp[32], bdtmp[32];
 FILE   *UNiop;
@@ -130,8 +129,8 @@ char *argv[];
        Change flags for 'fatal' so that it will return to this
        routine (main) instead of terminating processing.
        */
        Change flags for 'fatal' so that it will return to this
        routine (main) instead of terminating processing.
        */
-       Fflags =& ~FTLEXIT;
-       Fflags =| FTLJMP;
+       Fflags &= ~FTLEXIT;
+       Fflags |= FTLJMP;
 
        /*
        Call 'prs' routine for each file argument.
 
        /*
        Call 'prs' routine for each file argument.
@@ -265,7 +264,7 @@ register struct packet *pkt;
  * immediately.
 */
 
  * immediately.
 */
 
-static char    Zkeywd[5]       "@(#)";
+static char    Zkeywd[5] = "@(#)";
 scanspec(spec,dtp,statp)
 char spec[];
 struct deltab  *dtp;
 scanspec(spec,dtp,statp)
 char spec[];
 struct deltab  *dtp;
@@ -350,7 +349,7 @@ struct      stats   *statp;
                else if(lp[0] == ':' && lp[1] != 0 && lp[2] !=0 && lp[3] == ':') {
                        if (lp[1] == ':') {
                                putchar(':');
                else if(lp[0] == ':' && lp[1] != 0 && lp[2] !=0 && lp[3] == ':') {
                        if (lp[1] == ':') {
                                putchar(':');
-                               *lp =+ 2;
+                               *lp += 2;
                                continue;
                        }
                        u.str[1] = *++lp;
                                continue;
                        }
                        u.str[1] = *++lp;
@@ -734,7 +733,7 @@ struct packet *pkt;
 getit(str,cp)
 register       char    *str, *cp;
 {
 getit(str,cp)
 register       char    *str, *cp;
 {
-       cp =+ 2;
+       cp += 2;
        NONBLANK(cp);
        cp[length(cp) - 1] = '\0';
        sprintf(str,"%s",cp);
        NONBLANK(cp);
        cp[length(cp) - 1] = '\0';
        sprintf(str,"%s",cp);
index ba25285..430d7c1 100644 (file)
@@ -1,7 +1,7 @@
 # include "../hdr/defines.h"
 # include "../hdr/had.h"
 
 # include "../hdr/defines.h"
 # include "../hdr/had.h"
 
-SCCSID(@(#)prt.c       4.1);
+static char Sccsid[] = "@(#)prt.c      4.2     %G%";
 
 /*
        Program to print parts or all of an SCCS file.
 
 /*
        Program to print parts or all of an SCCS file.
@@ -38,7 +38,7 @@ long cutoff;
 long revcut;
 int linenum;
 char *ysid;
 long revcut;
 int linenum;
 char *ysid;
-char *flagdesc[26] {   "",
+char *flagdesc[26] = { "",
                        "branch",
                        "ceiling",
                        "default SID",
                        "branch",
                        "ceiling",
                        "default SID",
@@ -145,8 +145,8 @@ char *argv[];
        Change flags for 'fatal' so that it will return to this
        routine (main) instead of terminating processing.
        */
        Change flags for 'fatal' so that it will return to this
        routine (main) instead of terminating processing.
        */
-       Fflags =& ~FTLEXIT;
-       Fflags =| FTLJMP;
+       Fflags &= ~FTLEXIT;
+       Fflags |= FTLJMP;
 
        /*
        Call 'prt' routine for each file argument.
 
        /*
        Call 'prt' routine for each file argument.
@@ -336,7 +336,7 @@ getdel(delp,lp)
 register struct delent *delp;
 register char *lp;
 {
 register struct delent *delp;
 register char *lp;
 {
-       lp =+ 2;
+       lp += 2;
        NONBLANK(lp);
        delp->type = *lp++;
        NONBLANK(lp);
        NONBLANK(lp);
        delp->type = *lp++;
        NONBLANK(lp);
index dda9776..dc60e26 100644 (file)
@@ -1,7 +1,7 @@
 # include "../hdr/defines.h"
 # include "../hdr/had.h"
 
 # include "../hdr/defines.h"
 # include "../hdr/had.h"
 
-SCCSID(@(#)rmchg.c     4.2);
+static char Sccsid[] = "@(#)rmchg.c    4.3     %G%";
 
 /*
        Program to remove a specified delta from an SCCS file,
 
 /*
        Program to remove a specified delta from an SCCS file,
@@ -92,8 +92,8 @@ char *argv[];
        Change flags for 'fatal' so that it will return to this
        routine (main) instead of terminating processing.
        */
        Change flags for 'fatal' so that it will return to this
        routine (main) instead of terminating processing.
        */
-       Fflags =& ~FTLEXIT;
-       Fflags =| FTLJMP;
+       Fflags &= ~FTLEXIT;
+       Fflags |= FTLJMP;
 
        /*
        Call 'rmchg' routine for each file argument.
 
        /*
        Call 'rmchg' routine for each file argument.
@@ -130,7 +130,7 @@ USXALLOC();         /* defines alloc() and free() */
 rmchg(file)
 char *file;
 {
 rmchg(file)
 char *file;
 {
-       static int first_time 1;
+       static int first_time 1;
        struct deltab dt;       /* see file s.defines.h */
        struct stats stats;     /* see file s.defines.h */
        extern char *Sflags[];
        struct deltab dt;       /* see file s.defines.h */
        struct stats stats;     /* see file s.defines.h */
        extern char *Sflags[];
index f0b8490..0049d84 100644 (file)
@@ -1,10 +1,10 @@
 # include      "../hdr/defines.h"
 # include      "../hdr/had.h"
 
 # include      "../hdr/defines.h"
 # include      "../hdr/had.h"
 
-SCCSID(@(#)snull.c     4.3);
+static char Sccsid[] = "@(#)snull.c    4.4     %G%";
 USXALLOC();
 
 USXALLOC();
 
-int    Debug   0;
+int    Debug = 0;
 struct packet gpkt;
 struct sid sid;
 int    num_files;
 struct packet gpkt;
 struct sid sid;
 int    num_files;
@@ -69,8 +69,8 @@ register char *argv[];
        Reset flags for 'fatal' so that it will return to 'main'
        rather than exiting.
        */
        Reset flags for 'fatal' so that it will return to 'main'
        rather than exiting.
        */
-       Fflags =& ~FTLEXIT;
-       Fflags =| FTLJMP;
+       Fflags &= ~FTLEXIT;
+       Fflags |= FTLJMP;
 
        /*
        Invoke 'snull' for each file argument. 
 
        /*
        Invoke 'snull' for each file argument. 
@@ -327,7 +327,7 @@ mkdelt()
                if (reldiff < 0)
                        fatal("file has invalid trunk delta (sn1)");
 
                if (reldiff < 0)
                        fatal("file has invalid trunk delta (sn1)");
 
-               currel =+ reldiff;      /* update currel */
+               currel += reldiff;      /* update currel */
 
                /*
                Find pointer to ancestor delta.
 
                /*
                Find pointer to ancestor delta.
@@ -377,9 +377,9 @@ mkdelt()
                reldiff--;
                while (ptrtemp) {
                        if (ptrtemp->ds_ser >= serhold)
                reldiff--;
                while (ptrtemp) {
                        if (ptrtemp->ds_ser >= serhold)
-                               ptrtemp->ds_ser =+ reldiff;
+                               ptrtemp->ds_ser += reldiff;
                        if (ptrtemp->ds_pred >= serhold)
                        if (ptrtemp->ds_pred >= serhold)
-                               ptrtemp->ds_pred =+ reldiff;
+                               ptrtemp->ds_pred += reldiff;
 
                        ptrtemp = ptrtemp->ds_youngerdel;
                }
 
                        ptrtemp = ptrtemp->ds_youngerdel;
                }
index 4f52437..0e25d15 100644 (file)
@@ -47,7 +47,7 @@ struct delent {               /* structure for delta table entry */
        char *pred;
 } del;
 
        char *pred;
 } del;
 
-SCCSID(@(#)val.c       4.2);
+static char Sccsid[] = "@(#)val.c      4.3     %G%";
 
 /* This is the main program that determines whether the command line
  * comes from the standard input or read off the original command
 
 /* This is the main program that determines whether the command line
  * comes from the standard input or read off the original command
@@ -68,7 +68,7 @@ char  *argv[];
                        if (line[0] != '\n') {
                                repl (line,'\n','\0');
                                process(line);
                        if (line[0] != '\n') {
                                repl (line,'\n','\0');
                                process(line);
-                               ret_code =| inline_err;
+                               ret_code |= inline_err;
                        }
                }
        }
                        }
                }
        }
@@ -126,7 +126,7 @@ char        *p_line;
                testklt = 1;
                NONBLANK(p_line);
                if (*p_line == '-') {
                testklt = 1;
                NONBLANK(p_line);
                if (*p_line == '-') {
-                       p_line =+ 1;
+                       p_line += 1;
                        c = *p_line;
                        p_line++;
                        switch (c) {
                        c = *p_line;
                        p_line++;
                        switch (c) {
@@ -147,14 +147,14 @@ char      *p_line;
                                        p_line = getval(p_line,name);
                                        break;
                                default:
                                        p_line = getval(p_line,name);
                                        break;
                                default:
-                                       inline_err =| UNKDUP_ERR;
+                                       inline_err |= UNKDUP_ERR;
                        }
                        /*
                        use 'had' array and determine if the keyletter
                        was given twice.
                        */
                        if (had[c - 'a']++ && testklt++)
                        }
                        /*
                        use 'had' array and determine if the keyletter
                        was given twice.
                        */
                        if (had[c - 'a']++ && testklt++)
-                               inline_err =| UNKDUP_ERR;
+                               inline_err |= UNKDUP_ERR;
                }
                else {
                        /*
                }
                else {
                        /*
@@ -168,7 +168,7 @@ char        *p_line;
        check if any files were named as arguments
        */
        if (num_files == 0)
        check if any files were named as arguments
        */
        if (num_files == 0)
-               inline_err =| FILARG_ERR;
+               inline_err |= FILARG_ERR;
        /*
        check for error in command line.
        */
        /*
        check for error in command line.
        */
@@ -188,7 +188,7 @@ char        *p_line;
                */
                sprintf(path,"%s",filelist[j]);
                validate(path,sid,type,name);
                */
                sprintf(path,"%s",filelist[j]);
                validate(path,sid,type,name);
-               inline_err =| infile_err;
+               inline_err |= infile_err;
                /*
                check for error from 'validate' and call 'report'
                depending on 'silent' flag.
                /*
                check for error from 'validate' and call 'report'
                depending on 'silent' flag.
@@ -223,14 +223,14 @@ char      *c_name;
        infile_err = goods = goodt = goodn = hadmflag = 0;
        sinit(&gpkt,c_path);
        if (!sccsfile(c_path) || (gpkt.p_iop = fopen(c_path,"r")) == NULL)
        infile_err = goods = goodt = goodn = hadmflag = 0;
        sinit(&gpkt,c_path);
        if (!sccsfile(c_path) || (gpkt.p_iop = fopen(c_path,"r")) == NULL)
-               infile_err =| FILENAM_ERR;
+               infile_err |= FILENAM_ERR;
        else {
                l = get_line(&gpkt);            /* read first line in file */
                /*
                check that it is header line.
                */
                if (*l++ != CTLCHAR || *l++ != HEAD)
        else {
                l = get_line(&gpkt);            /* read first line in file */
                /*
                check that it is header line.
                */
                if (*l++ != CTLCHAR || *l++ != HEAD)
-                       infile_err =| CORRUPT_ERR;
+                       infile_err |= CORRUPT_ERR;
 
                else {
                        /*
 
                else {
                        /*
@@ -243,14 +243,14 @@ char      *c_name;
                                check for invalid or ambiguous SID.
                                */
                                if (invalid(c_sid))
                                check for invalid or ambiguous SID.
                                */
                                if (invalid(c_sid))
-                                       infile_err =| INVALSID_ERR;
+                                       infile_err |= INVALSID_ERR;
                        /*
                        read delta table checking for errors and/or
                        SID.
                        */
                        if (do_delt(&gpkt,goods,c_sid)) {
                                fclose(gpkt.p_iop);
                        /*
                        read delta table checking for errors and/or
                        SID.
                        */
                        if (do_delt(&gpkt,goods,c_sid)) {
                                fclose(gpkt.p_iop);
-                               infile_err =| CORRUPT_ERR;
+                               infile_err |= CORRUPT_ERR;
                                return;
                        }
 
                                return;
                        }
 
@@ -266,36 +266,36 @@ char      *c_name;
                                        NONBLANK(l);
                                        repl(l,'\n','\0');
                                        if (*l == TYPEFLAG) {
                                        NONBLANK(l);
                                        repl(l,'\n','\0');
                                        if (*l == TYPEFLAG) {
-                                               l =+ 2;
+                                               l += 2;
                                                if (equal(c_type,l))
                                                        goodt++;
                                        }
                                        else if (*l == MODFLAG) {
                                                hadmflag++;
                                                if (equal(c_type,l))
                                                        goodt++;
                                        }
                                        else if (*l == MODFLAG) {
                                                hadmflag++;
-                                               l =+ 2;
+                                               l += 2;
                                                if (equal(c_name,l))
                                                        goodn++;
                                        }
                                }
                                if (*(--l) != BUSERTXT) {
                                        fclose(gpkt.p_iop);
                                                if (equal(c_name,l))
                                                        goodn++;
                                        }
                                }
                                if (*(--l) != BUSERTXT) {
                                        fclose(gpkt.p_iop);
-                                       infile_err =| CORRUPT_ERR;
+                                       infile_err |= CORRUPT_ERR;
                                        return;
                                }
                                /*
                                check if 'y' flag matched '-y' arg value.
                                */
                                if (!goodt && HADY)
                                        return;
                                }
                                /*
                                check if 'y' flag matched '-y' arg value.
                                */
                                if (!goodt && HADY)
-                                       infile_err =| TYPE_ERR;
+                                       infile_err |= TYPE_ERR;
                                /*
                                check if 'm' flag matched '-m' arg value.
                                */
                                if (HADM && !hadmflag) {
                                        if (!equal(auxf(sname(c_path),'g'),c_name))
                                /*
                                check if 'm' flag matched '-m' arg value.
                                */
                                if (HADM && !hadmflag) {
                                        if (!equal(auxf(sname(c_path),'g'),c_name))
-                                               infile_err =| NAME_ERR;
+                                               infile_err |= NAME_ERR;
                                }
                                else if (HADM && hadmflag && !goodn)
                                }
                                else if (HADM && hadmflag && !goodn)
-                                               infile_err =| NAME_ERR;
+                                               infile_err |= NAME_ERR;
                        }
                        else read_to(BUSERTXT,&gpkt);
                        read_to(EUSERTXT,&gpkt);
                        }
                        else read_to(BUSERTXT,&gpkt);
                        read_to(EUSERTXT,&gpkt);
@@ -456,13 +456,13 @@ register struct packet *pkt;
        if ((n = fgets(pkt->p_line,sizeof(pkt->p_line),pkt->p_iop)) != NULL) {
                pkt->p_slnno++;
                for (p = pkt->p_line; *p; )
        if ((n = fgets(pkt->p_line,sizeof(pkt->p_line),pkt->p_iop)) != NULL) {
                pkt->p_slnno++;
                for (p = pkt->p_line; *p; )
-                       pkt->p_chash =+ *p++;
+                       pkt->p_chash += *p++;
        }
        else {
                if (!pkt->p_chkeof)
        }
        else {
                if (!pkt->p_chkeof)
-                       infile_err =| CORRUPT_ERR;
+                       infile_err |= CORRUPT_ERR;
                if (pkt->do_chksum && (pkt->p_chash ^ pkt->p_ihash)&0xFFFF)
                if (pkt->do_chksum && (pkt->p_chash ^ pkt->p_ihash)&0xFFFF)
-                       infile_err =| CORRUPT_ERR;
+                       infile_err |= CORRUPT_ERR;
        }
        return(n);
 }
        }
        return(n);
 }
@@ -498,7 +498,7 @@ register struct packet *pkt;
                        continue;
                else {
                        if (!((iord = *p++) == INS || iord == DEL || iord == END)) {
                        continue;
                else {
                        if (!((iord = *p++) == INS || iord == DEL || iord == END)) {
-                               infile_err =| CORRUPT_ERR;
+                               infile_err |= CORRUPT_ERR;
                                return(0);
                        }
                        NONBLANK(p);
                                return(0);
                        }
                        NONBLANK(p);
@@ -512,7 +512,7 @@ register struct packet *pkt;
                }
        }
        if (pkt->p_q)
                }
        }
        if (pkt->p_q)
-               infile_err =| CORRUPT_ERR;
+               infile_err |= CORRUPT_ERR;
        return(0);
 }
 
        return(0);
 }
 
@@ -529,7 +529,7 @@ int iord;
                if (cur->q_sernum <= ser)
                        break;
        if (cur->q_sernum == ser)
                if (cur->q_sernum <= ser)
                        break;
        if (cur->q_sernum == ser)
-               infile_err =| CORRUPT_ERR;
+               infile_err |= CORRUPT_ERR;
        prev->q_next = q = alloc(sizeof(*q));
        q->q_next = cur;
        q->q_sernum = ser;
        prev->q_next = q = alloc(sizeof(*q));
        q->q_next = cur;
        q->q_sernum = ser;
@@ -562,7 +562,7 @@ int ser;
                setkeep(pkt);
        }
        else
                setkeep(pkt);
        }
        else
-               infile_err =| CORRUPT_ERR;
+               infile_err |= CORRUPT_ERR;
 }
 
 
 }
 
 
@@ -671,7 +671,7 @@ register char *d_sid;
        if (pkt->p_line[1] != BUSERNAM)
                return(1);
        if (HADR && !goods && !(infile_err & INVALSID_ERR))
        if (pkt->p_line[1] != BUSERNAM)
                return(1);
        if (HADR && !goods && !(infile_err & INVALSID_ERR))
-               infile_err =| NONEXSID_ERR;
+               infile_err |= NONEXSID_ERR;
        return(0);
 }
 
        return(0);
 }
 
index 0fa982f..07d5d91 100644 (file)
@@ -1,7 +1,7 @@
 # include "../hdr/defines.h"
 # include "../hdr/had.h"
 
 # include "../hdr/defines.h"
 # include "../hdr/had.h"
 
-SCCSID(@(#)admin.c     4.1);
+static char Sccsid[] = "@(#)admin.c    4.2     %G%";
 
 /*
        Program to create new SCCS files and change parameters
 
 /*
        Program to create new SCCS files and change parameters
@@ -33,9 +33,9 @@ char *ifile, *tfile;
 char *z;       /* for validation program name */
 char had[26], had_flag[26], rm_flag[26];
 char   *Comments, *Mrs;
 char *z;       /* for validation program name */
 char had[26], had_flag[26], rm_flag[26];
 char   *Comments, *Mrs;
-char Valpgm[]          "/usr/local/val";
+char Valpgm[] = "/usr/local/val";
 int irel, fexists, num_files;
 int irel, fexists, num_files;
-int    VFLAG   0;
+int    VFLAG = 0;
 int    Domrs;
 char *Sflags[];
 char *anames[MAXNAMES], *enames[MAXNAMES];
 int    Domrs;
 char *Sflags[];
 char *anames[MAXNAMES], *enames[MAXNAMES];
@@ -232,8 +232,8 @@ char *argv[];
        Change flags for 'fatal' so that it will return to this
        routine (main) instead of terminating processing.
        */
        Change flags for 'fatal' so that it will return to this
        routine (main) instead of terminating processing.
        */
-       Fflags =& ~FTLEXIT;
-       Fflags =| FTLJMP;
+       Fflags &= ~FTLEXIT;
+       Fflags |= FTLJMP;
 
        /*
        Call 'admin' routine for each file argument.
 
        /*
        Call 'admin' routine for each file argument.
@@ -514,7 +514,7 @@ char *afile;
 
                        gpkt.p_wrttn = 1;       /* don't write previous line */
 
 
                        gpkt.p_wrttn = 1;       /* don't write previous line */
 
-                       cp =+ 2;        /* point to flag character */
+                       cp += 2;        /* point to flag character */
                        k = *cp - 'a';
 
                        if (!had_flag[k] && !rm_flag[k]) {
                        k = *cp - 'a';
 
                        if (!had_flag[k] && !rm_flag[k]) {
index 8e68f5e..63c20af 100644 (file)
@@ -1,6 +1,6 @@
 # include "../hdr/defines.h"
 
 # include "../hdr/defines.h"
 
-SCCSID(@(#)bdiff.c     4.2);
+static char Sccsid[] = "@(#)bdiff.c    4.3     %G%";
 
 /*
        This program segments two files into pieces of <= seglim lines
 
 /*
        This program segments two files into pieces of <= seglim lines
@@ -22,8 +22,8 @@ SCCSID(@(#)bdiff.c    4.2);
 
 int seglim;    /* limit of size of file segment to be generated */
 
 
 int seglim;    /* limit of size of file segment to be generated */
 
-char diff[]    "/bin/diff";
-char tempskel[] "/tmp/bdXXXXX";                /* used to generate temp file names */
+char diff[] = "/bin/diff";
+char tempskel[] = "/tmp/bdXXXXX";              /* used to generate temp file names */
 char tempfile[32];
 char otmp[32], ntmp[32];
 int linenum;
 char tempfile[32];
 char otmp[32], ntmp[32];
 int linenum;
@@ -66,13 +66,13 @@ char *argv[];
 
        if (argc > 3) {
                if (argv[3][0] == '-' && argv[3][1] == 's')
 
        if (argc > 3) {
                if (argv[3][0] == '-' && argv[3][1] == 's')
-                       Fflags =& ~FTLMSG;
+                       Fflags &= ~FTLMSG;
                else {
                        if ((seglim = patoi(argv[3])) == -1)
                                fatal("non-numeric limit (bd4)");
                        if (argc == 5 && argv[4][0] == '-' &&
                                        argv[4][1] == 's')
                else {
                        if ((seglim = patoi(argv[3])) == -1)
                                fatal("non-numeric limit (bd4)");
                        if (argc == 5 && argv[4][0] == '-' &&
                                        argv[4][1] == 's')
-                               Fflags =& ~FTLMSG;
+                               Fflags &= ~FTLMSG;
                }
        }
 
                }
        }
 
@@ -226,7 +226,7 @@ char *argv[];
                        if (status&~0x100)
                                fatal(sprintf(Error,"'%s' failed (bd6)",diff));
                }
                        if (status&~0x100)
                                fatal(sprintf(Error,"'%s' failed (bd6)",diff));
                }
-               linenum =+ seglim;
+               linenum += seglim;
 
                /*
                Remove temporary files.
 
                /*
                Remove temporary files.
@@ -300,7 +300,7 @@ char *lp;
 
                default:
                        lp = satoi(lp,&num);
 
                default:
                        lp = satoi(lp,&num);
-                       num =+ linenum;
+                       num += linenum;
                        printf("%d",num);
                }
        }
                        printf("%d",num);
                }
        }
index 990a22e..5a9c63a 100644 (file)
@@ -1,7 +1,7 @@
 # include      "../hdr/defines.h"
 # include      "../hdr/had.h"
 
 # include      "../hdr/defines.h"
 # include      "../hdr/had.h"
 
-SCCSID(@(#)cmt.c       4.3);
+static char Sccsid[] = "@(#)cmt.c      4.4     %G%";
 
 struct packet gpkt;
 int    num_files, had_ffile;
 
 struct packet gpkt;
 int    num_files, had_ffile;
@@ -9,7 +9,7 @@ int     F_Opened, Opened, Domrs, First;
 char   *Comments, *Mrs, *ffile;
 char   Cstr[BUFSIZ], Mstr[BUFSIZ], Line[BUFSIZ], had[26];
 FILE   *iop, *Xiop;
 char   *Comments, *Mrs, *ffile;
 char   Cstr[BUFSIZ], Mstr[BUFSIZ], Line[BUFSIZ], had[26];
 FILE   *iop, *Xiop;
-static char    ifde[]  "initial file does not exists";
+static char ifde[] = "initial file does not exists";
 
 main(argc,argv)
 int argc;
 
 main(argc,argv)
 int argc;
@@ -58,8 +58,8 @@ register char *argv[];
        Reset flags for 'fatal' so that it will return to 'main'
        rather than exiting.
        */
        Reset flags for 'fatal' so that it will return to 'main'
        rather than exiting.
        */
-       Fflags =& ~FTLEXIT;
-       Fflags =| FTLJMP;
+       Fflags &= ~FTLEXIT;
+       Fflags |= FTLJMP;
 
        /*
        Invoke 'cmt' for each file argument. 
 
        /*
        Invoke 'cmt' for each file argument. 
@@ -72,9 +72,9 @@ register char *argv[];
 }
 
 
 }
 
 
-static char s_warn[] "WARNING: MR flag is set; `%s' should contain both MR line and comment line\n";
+static char s_warn[] "WARNING: MR flag is set; `%s' should contain both MR line and comment line\n";
 
 
-static char ns_warn[] "WARNING: MR flag is not set; `%s' should only contain comment line\n";
+static char ns_warn[] "WARNING: MR flag is not set; `%s' should only contain comment line\n";
 
 cmt(file)
 register char *file;
 
 cmt(file)
 register char *file;
@@ -158,13 +158,13 @@ register char *file;
 }
 
 
 }
 
 
-static char    cle[]   "comment line for initial delta already exists";
+static char cle[] = "comment line for initial delta already exists";
 
 do_delt(pkt)
 register struct packet *pkt;
 {
        int     n;
 
 do_delt(pkt)
 register struct packet *pkt;
 {
        int     n;
-       int     did_zero 0;
+       int     did_zero 0;
        struct deltab dt;
        struct stats stats;
 
        struct deltab dt;
        struct stats stats;
 
index 96ec1ec..2e743cd 100644 (file)
@@ -1,7 +1,7 @@
 # include      "../hdr/defines.h"
 # include      "../hdr/had.h"
 
 # include      "../hdr/defines.h"
 # include      "../hdr/had.h"
 
-SCCSID(@(#)comb.c      4.2);
+static char Sccsid[] = "@(#)comb.c     4.3     %G%";
 USXALLOC();
 
 struct packet gpkt;
 USXALLOC();
 
 struct packet gpkt;
@@ -68,8 +68,8 @@ register char *argv[];
        if (HADP && HADC)
                fatal("can't have both -p and -c (cb2)");
        setsig();
        if (HADP && HADC)
                fatal("can't have both -p and -c (cb2)");
        setsig();
-       Fflags =& ~FTLEXIT;
-       Fflags =| FTLJMP;
+       Fflags &= ~FTLEXIT;
+       Fflags |= FTLJMP;
        iop = stdout;
        for (i = 1; i < argc; i++)
                if (p=argv[i])
        iop = stdout;
        for (i = 1; i < argc; i++)
                if (p=argv[i])
index 5473eec..f10a6e5 100644 (file)
@@ -1,7 +1,7 @@
 # include      "../hdr/defines.h"
 # include      "../hdr/had.h"
 
 # include      "../hdr/defines.h"
 # include      "../hdr/had.h"
 
-SCCSID(@(#)delta.c     4.7);
+static char Sccsid[] = "@(#)delta.c    4.8     %G%";
 USXALLOC();
 
 # ifdef LOGDELTA
 USXALLOC();
 
 # ifdef LOGDELTA
@@ -11,7 +11,7 @@ FILE  *Logf;
 
 char   Diffpgm[] = "/usr/local/bdiff";
 FILE   *Diffin;
 
 char   Diffpgm[] = "/usr/local/bdiff";
 FILE   *Diffin;
-int    Debug   0;
+int    Debug = 0;
 struct packet gpkt;
 struct sid sid;
 int    num_files;
 struct packet gpkt;
 struct sid sid;
 int    num_files;
@@ -89,8 +89,8 @@ register char *argv[];
        Logf = fopen(LogFile, "a");
 # endif
        setsig();
        Logf = fopen(LogFile, "a");
 # endif
        setsig();
-       Fflags =& ~FTLEXIT;
-       Fflags =| FTLJMP;
+       Fflags &= ~FTLEXIT;
+       Fflags |= FTLJMP;
        for (i=1; i<argc; i++)
                if (p=argv[i])
                        do_file(p,delta);
        for (i=1; i<argc; i++)
                if (p=argv[i])
                        do_file(p,delta);
@@ -105,7 +105,7 @@ register char *argv[];
 delta(file)
 char *file;
 {
 delta(file)
 char *file;
 {
-       static int first 1;
+       static int first 1;
        register char *p;
        int n, linenum;
        char type;
        register char *p;
        int n, linenum;
        char type;
@@ -199,11 +199,11 @@ char *file;
                Diffin = dodiff(auxf(gpkt.p_file,'g'),dfilename,difflim);
                while (n = getdiff(&type,&linenum)) {
                        if (type == INS) {
                Diffin = dodiff(auxf(gpkt.p_file,'g'),dfilename,difflim);
                while (n = getdiff(&type,&linenum)) {
                        if (type == INS) {
-                               inserted =+ n;
+                               inserted += n;
                                insert(&gpkt,linenum,n,newser);
                        }
                        else {
                                insert(&gpkt,linenum,n,newser);
                        }
                        else {
-                               deleted =+ n;
+                               deleted += n;
                                delete(&gpkt,linenum,n,newser);
                        }
                }
                                delete(&gpkt,linenum,n,newser);
                        }
                }
index 3c9e13b..df0b225 100644 (file)
@@ -4,16 +4,16 @@
 # include      "../hdr/had.h"
 # include      <sys/dir.h>
 
 # include      "../hdr/had.h"
 # include      <sys/dir.h>
 
-SCCSID(@(#)get.c       4.7);
+static char Sccsid[] = "@(#)get.c      4.8     %G%";
 
 
-int    Debug   0;
+int    Debug = 0;
 struct packet gpkt;
 struct sid sid;
 unsigned       Ser;
 int    num_files;
 char   had[26];
 char   *ilist, *elist, *lfile;
 struct packet gpkt;
 struct sid sid;
 unsigned       Ser;
 int    num_files;
 char   had[26];
 char   *ilist, *elist, *lfile;
-long   cutoff  0X7FFFFFFFL;    /* max positive long */
+long   cutoff = 0X7FFFFFFFL;   /* max positive long */
 int verbosity;
 char   Gfile[MAXNAMLEN + 3];
 char   Mod[MAXNAMLEN + 3];             /* should be as large as Gfile? */
 int verbosity;
 char   Gfile[MAXNAMLEN + 3];
 char   Mod[MAXNAMLEN + 3];             /* should be as large as Gfile? */
@@ -113,8 +113,8 @@ register char *argv[];
        if (!HADS)
                verbosity = -1;
        setsig();
        if (!HADS)
                verbosity = -1;
        setsig();
-       Fflags =& ~FTLEXIT;
-       Fflags =| FTLJMP;
+       Fflags &= ~FTLEXIT;
+       Fflags |= FTLJMP;
        for (i=1; i<argc; i++)
                if (p=argv[i])
                        do_file(p,get);
        for (i=1; i<argc; i++)
                if (p=argv[i])
                        do_file(p,get);
@@ -242,7 +242,7 @@ int branch;
 
        chkbr = 0;
        if (pkt->p_reqsid.s_br == 0) {
 
        chkbr = 0;
        if (pkt->p_reqsid.s_br == 0) {
-               pkt->p_reqsid.s_lev =+ 1;
+               pkt->p_reqsid.s_lev += 1;
                if (sidtoser(&pkt->p_reqsid,pkt) ||
                        pkt->p_maxr > pkt->p_reqsid.s_rel || branch) {
                                pkt->p_reqsid.s_rel = pkt->p_gotsid.s_rel;
                if (sidtoser(&pkt->p_reqsid,pkt) ||
                        pkt->p_maxr > pkt->p_reqsid.s_rel || branch) {
                                pkt->p_reqsid.s_rel = pkt->p_gotsid.s_rel;
@@ -255,16 +255,16 @@ int branch;
        else if (pkt->p_reqsid.s_seq == 0 && !branch)
                pkt->p_reqsid.s_seq = pkt->p_gotsid.s_seq + 1;
        else {
        else if (pkt->p_reqsid.s_seq == 0 && !branch)
                pkt->p_reqsid.s_seq = pkt->p_gotsid.s_seq + 1;
        else {
-               pkt->p_reqsid.s_seq =+ 1;
+               pkt->p_reqsid.s_seq += 1;
                if (branch || sidtoser(&pkt->p_reqsid,pkt)) {
                if (branch || sidtoser(&pkt->p_reqsid,pkt)) {
-                       pkt->p_reqsid.s_br =+ 1;
+                       pkt->p_reqsid.s_br += 1;
                        pkt->p_reqsid.s_seq = 1;
                        chkbr++;
                }
        }
        if (chkbr)
                while (sidtoser(&pkt->p_reqsid,pkt))
                        pkt->p_reqsid.s_seq = 1;
                        chkbr++;
                }
        }
        if (chkbr)
                while (sidtoser(&pkt->p_reqsid,pkt))
-                       pkt->p_reqsid.s_br =+ 1;
+                       pkt->p_reqsid.s_br += 1;
        if (sidtoser(&pkt->p_reqsid,pkt))
                fatal("internal error in newsid()");
 }
        if (sidtoser(&pkt->p_reqsid,pkt))
                fatal("internal error in newsid()");
 }
@@ -477,7 +477,7 @@ register char *old, *new;
        *new = '\0';
 }
 
        *new = '\0';
 }
 
-static char Zkeywd[5]  "@(#)";
+static char Zkeywd[5] = "@(#)";
 
 
 idsubst(pkt,line)
 
 
 idsubst(pkt,line)
index c60604b..5e3f7c9 100644 (file)
@@ -1,6 +1,6 @@
 # include      "../hdr/defines.h"
 
 # include      "../hdr/defines.h"
 
-SCCSID(@(#)help.c      4.1);
+static char Sccsid[] = "@(#)help.c     4.2     %G%";
 
 /*
        Program to locate helpful info in an ascii file.
 
 /*
        Program to locate helpful info in an ascii file.
@@ -39,8 +39,8 @@ SCCSID(@(#)help.c     4.1);
 
        If the argument is omitted, the program requests it.
 */
 
        If the argument is omitted, the program requests it.
 */
-char   oldfile[]       "/usr/local/lib/sccs.hf";
-char   helpdir[]       "/usr/local/lib/help/";
+char   oldfile[] = "/usr/local/lib/sccs.hf";
+char   helpdir[] = "/usr/local/lib/help/";
 char   hfile[64];
 FILE   *iop;
 char   line [512];
 char   hfile[64];
 FILE   *iop;
 char   line [512];
index 78d6ca5..9c31246 100644 (file)
 # include "../hdr/defines.h"
 # include "../hdr/had.h"
 
 # include "../hdr/defines.h"
 # include "../hdr/had.h"
 
-SCCSID(@(#)prs.c       4.1);
+static char Sccsid[] = "@(#)prs.c      4.2     %G%";
 
 char   had[26];
 
 char   had[26];
-char   Getpgm[]        "/usr/local/get";
+char   Getpgm[] = "/usr/local/get";
 char   Sid[32];
 char   Mod[16];
 char   *Type;
 char   Deltadate[18];
 char   *Deltatime;
 char   Sid[32];
 char   Mod[16];
 char   *Type;
 char   Deltadate[18];
 char   *Deltatime;
-char   tempskel[]      "/tmp/prXXXXXX";        /* used to generate temp
-                                                  file names
-                                               */
+char   tempskel[] = "/tmp/prXXXXXX";   /* used to generate temp file names */
+
 char   untmp[32], uttmp[32], cmtmp[32];
 char   mrtmp[32], bdtmp[32];
 FILE   *UNiop;
 char   untmp[32], uttmp[32], cmtmp[32];
 char   mrtmp[32], bdtmp[32];
 FILE   *UNiop;
@@ -130,8 +129,8 @@ char *argv[];
        Change flags for 'fatal' so that it will return to this
        routine (main) instead of terminating processing.
        */
        Change flags for 'fatal' so that it will return to this
        routine (main) instead of terminating processing.
        */
-       Fflags =& ~FTLEXIT;
-       Fflags =| FTLJMP;
+       Fflags &= ~FTLEXIT;
+       Fflags |= FTLJMP;
 
        /*
        Call 'prs' routine for each file argument.
 
        /*
        Call 'prs' routine for each file argument.
@@ -265,7 +264,7 @@ register struct packet *pkt;
  * immediately.
 */
 
  * immediately.
 */
 
-static char    Zkeywd[5]       "@(#)";
+static char    Zkeywd[5] = "@(#)";
 scanspec(spec,dtp,statp)
 char spec[];
 struct deltab  *dtp;
 scanspec(spec,dtp,statp)
 char spec[];
 struct deltab  *dtp;
@@ -350,7 +349,7 @@ struct      stats   *statp;
                else if(lp[0] == ':' && lp[1] != 0 && lp[2] !=0 && lp[3] == ':') {
                        if (lp[1] == ':') {
                                putchar(':');
                else if(lp[0] == ':' && lp[1] != 0 && lp[2] !=0 && lp[3] == ':') {
                        if (lp[1] == ':') {
                                putchar(':');
-                               *lp =+ 2;
+                               *lp += 2;
                                continue;
                        }
                        u.str[1] = *++lp;
                                continue;
                        }
                        u.str[1] = *++lp;
@@ -734,7 +733,7 @@ struct packet *pkt;
 getit(str,cp)
 register       char    *str, *cp;
 {
 getit(str,cp)
 register       char    *str, *cp;
 {
-       cp =+ 2;
+       cp += 2;
        NONBLANK(cp);
        cp[length(cp) - 1] = '\0';
        sprintf(str,"%s",cp);
        NONBLANK(cp);
        cp[length(cp) - 1] = '\0';
        sprintf(str,"%s",cp);
index ba25285..430d7c1 100644 (file)
@@ -1,7 +1,7 @@
 # include "../hdr/defines.h"
 # include "../hdr/had.h"
 
 # include "../hdr/defines.h"
 # include "../hdr/had.h"
 
-SCCSID(@(#)prt.c       4.1);
+static char Sccsid[] = "@(#)prt.c      4.2     %G%";
 
 /*
        Program to print parts or all of an SCCS file.
 
 /*
        Program to print parts or all of an SCCS file.
@@ -38,7 +38,7 @@ long cutoff;
 long revcut;
 int linenum;
 char *ysid;
 long revcut;
 int linenum;
 char *ysid;
-char *flagdesc[26] {   "",
+char *flagdesc[26] = { "",
                        "branch",
                        "ceiling",
                        "default SID",
                        "branch",
                        "ceiling",
                        "default SID",
@@ -145,8 +145,8 @@ char *argv[];
        Change flags for 'fatal' so that it will return to this
        routine (main) instead of terminating processing.
        */
        Change flags for 'fatal' so that it will return to this
        routine (main) instead of terminating processing.
        */
-       Fflags =& ~FTLEXIT;
-       Fflags =| FTLJMP;
+       Fflags &= ~FTLEXIT;
+       Fflags |= FTLJMP;
 
        /*
        Call 'prt' routine for each file argument.
 
        /*
        Call 'prt' routine for each file argument.
@@ -336,7 +336,7 @@ getdel(delp,lp)
 register struct delent *delp;
 register char *lp;
 {
 register struct delent *delp;
 register char *lp;
 {
-       lp =+ 2;
+       lp += 2;
        NONBLANK(lp);
        delp->type = *lp++;
        NONBLANK(lp);
        NONBLANK(lp);
        delp->type = *lp++;
        NONBLANK(lp);
index dda9776..dc60e26 100644 (file)
@@ -1,7 +1,7 @@
 # include "../hdr/defines.h"
 # include "../hdr/had.h"
 
 # include "../hdr/defines.h"
 # include "../hdr/had.h"
 
-SCCSID(@(#)rmchg.c     4.2);
+static char Sccsid[] = "@(#)rmchg.c    4.3     %G%";
 
 /*
        Program to remove a specified delta from an SCCS file,
 
 /*
        Program to remove a specified delta from an SCCS file,
@@ -92,8 +92,8 @@ char *argv[];
        Change flags for 'fatal' so that it will return to this
        routine (main) instead of terminating processing.
        */
        Change flags for 'fatal' so that it will return to this
        routine (main) instead of terminating processing.
        */
-       Fflags =& ~FTLEXIT;
-       Fflags =| FTLJMP;
+       Fflags &= ~FTLEXIT;
+       Fflags |= FTLJMP;
 
        /*
        Call 'rmchg' routine for each file argument.
 
        /*
        Call 'rmchg' routine for each file argument.
@@ -130,7 +130,7 @@ USXALLOC();         /* defines alloc() and free() */
 rmchg(file)
 char *file;
 {
 rmchg(file)
 char *file;
 {
-       static int first_time 1;
+       static int first_time 1;
        struct deltab dt;       /* see file s.defines.h */
        struct stats stats;     /* see file s.defines.h */
        extern char *Sflags[];
        struct deltab dt;       /* see file s.defines.h */
        struct stats stats;     /* see file s.defines.h */
        extern char *Sflags[];
index f0b8490..0049d84 100644 (file)
@@ -1,10 +1,10 @@
 # include      "../hdr/defines.h"
 # include      "../hdr/had.h"
 
 # include      "../hdr/defines.h"
 # include      "../hdr/had.h"
 
-SCCSID(@(#)snull.c     4.3);
+static char Sccsid[] = "@(#)snull.c    4.4     %G%";
 USXALLOC();
 
 USXALLOC();
 
-int    Debug   0;
+int    Debug = 0;
 struct packet gpkt;
 struct sid sid;
 int    num_files;
 struct packet gpkt;
 struct sid sid;
 int    num_files;
@@ -69,8 +69,8 @@ register char *argv[];
        Reset flags for 'fatal' so that it will return to 'main'
        rather than exiting.
        */
        Reset flags for 'fatal' so that it will return to 'main'
        rather than exiting.
        */
-       Fflags =& ~FTLEXIT;
-       Fflags =| FTLJMP;
+       Fflags &= ~FTLEXIT;
+       Fflags |= FTLJMP;
 
        /*
        Invoke 'snull' for each file argument. 
 
        /*
        Invoke 'snull' for each file argument. 
@@ -327,7 +327,7 @@ mkdelt()
                if (reldiff < 0)
                        fatal("file has invalid trunk delta (sn1)");
 
                if (reldiff < 0)
                        fatal("file has invalid trunk delta (sn1)");
 
-               currel =+ reldiff;      /* update currel */
+               currel += reldiff;      /* update currel */
 
                /*
                Find pointer to ancestor delta.
 
                /*
                Find pointer to ancestor delta.
@@ -377,9 +377,9 @@ mkdelt()
                reldiff--;
                while (ptrtemp) {
                        if (ptrtemp->ds_ser >= serhold)
                reldiff--;
                while (ptrtemp) {
                        if (ptrtemp->ds_ser >= serhold)
-                               ptrtemp->ds_ser =+ reldiff;
+                               ptrtemp->ds_ser += reldiff;
                        if (ptrtemp->ds_pred >= serhold)
                        if (ptrtemp->ds_pred >= serhold)
-                               ptrtemp->ds_pred =+ reldiff;
+                               ptrtemp->ds_pred += reldiff;
 
                        ptrtemp = ptrtemp->ds_youngerdel;
                }
 
                        ptrtemp = ptrtemp->ds_youngerdel;
                }
index 4f52437..0e25d15 100644 (file)
@@ -47,7 +47,7 @@ struct delent {               /* structure for delta table entry */
        char *pred;
 } del;
 
        char *pred;
 } del;
 
-SCCSID(@(#)val.c       4.2);
+static char Sccsid[] = "@(#)val.c      4.3     %G%";
 
 /* This is the main program that determines whether the command line
  * comes from the standard input or read off the original command
 
 /* This is the main program that determines whether the command line
  * comes from the standard input or read off the original command
@@ -68,7 +68,7 @@ char  *argv[];
                        if (line[0] != '\n') {
                                repl (line,'\n','\0');
                                process(line);
                        if (line[0] != '\n') {
                                repl (line,'\n','\0');
                                process(line);
-                               ret_code =| inline_err;
+                               ret_code |= inline_err;
                        }
                }
        }
                        }
                }
        }
@@ -126,7 +126,7 @@ char        *p_line;
                testklt = 1;
                NONBLANK(p_line);
                if (*p_line == '-') {
                testklt = 1;
                NONBLANK(p_line);
                if (*p_line == '-') {
-                       p_line =+ 1;
+                       p_line += 1;
                        c = *p_line;
                        p_line++;
                        switch (c) {
                        c = *p_line;
                        p_line++;
                        switch (c) {
@@ -147,14 +147,14 @@ char      *p_line;
                                        p_line = getval(p_line,name);
                                        break;
                                default:
                                        p_line = getval(p_line,name);
                                        break;
                                default:
-                                       inline_err =| UNKDUP_ERR;
+                                       inline_err |= UNKDUP_ERR;
                        }
                        /*
                        use 'had' array and determine if the keyletter
                        was given twice.
                        */
                        if (had[c - 'a']++ && testklt++)
                        }
                        /*
                        use 'had' array and determine if the keyletter
                        was given twice.
                        */
                        if (had[c - 'a']++ && testklt++)
-                               inline_err =| UNKDUP_ERR;
+                               inline_err |= UNKDUP_ERR;
                }
                else {
                        /*
                }
                else {
                        /*
@@ -168,7 +168,7 @@ char        *p_line;
        check if any files were named as arguments
        */
        if (num_files == 0)
        check if any files were named as arguments
        */
        if (num_files == 0)
-               inline_err =| FILARG_ERR;
+               inline_err |= FILARG_ERR;
        /*
        check for error in command line.
        */
        /*
        check for error in command line.
        */
@@ -188,7 +188,7 @@ char        *p_line;
                */
                sprintf(path,"%s",filelist[j]);
                validate(path,sid,type,name);
                */
                sprintf(path,"%s",filelist[j]);
                validate(path,sid,type,name);
-               inline_err =| infile_err;
+               inline_err |= infile_err;
                /*
                check for error from 'validate' and call 'report'
                depending on 'silent' flag.
                /*
                check for error from 'validate' and call 'report'
                depending on 'silent' flag.
@@ -223,14 +223,14 @@ char      *c_name;
        infile_err = goods = goodt = goodn = hadmflag = 0;
        sinit(&gpkt,c_path);
        if (!sccsfile(c_path) || (gpkt.p_iop = fopen(c_path,"r")) == NULL)
        infile_err = goods = goodt = goodn = hadmflag = 0;
        sinit(&gpkt,c_path);
        if (!sccsfile(c_path) || (gpkt.p_iop = fopen(c_path,"r")) == NULL)
-               infile_err =| FILENAM_ERR;
+               infile_err |= FILENAM_ERR;
        else {
                l = get_line(&gpkt);            /* read first line in file */
                /*
                check that it is header line.
                */
                if (*l++ != CTLCHAR || *l++ != HEAD)
        else {
                l = get_line(&gpkt);            /* read first line in file */
                /*
                check that it is header line.
                */
                if (*l++ != CTLCHAR || *l++ != HEAD)
-                       infile_err =| CORRUPT_ERR;
+                       infile_err |= CORRUPT_ERR;
 
                else {
                        /*
 
                else {
                        /*
@@ -243,14 +243,14 @@ char      *c_name;
                                check for invalid or ambiguous SID.
                                */
                                if (invalid(c_sid))
                                check for invalid or ambiguous SID.
                                */
                                if (invalid(c_sid))
-                                       infile_err =| INVALSID_ERR;
+                                       infile_err |= INVALSID_ERR;
                        /*
                        read delta table checking for errors and/or
                        SID.
                        */
                        if (do_delt(&gpkt,goods,c_sid)) {
                                fclose(gpkt.p_iop);
                        /*
                        read delta table checking for errors and/or
                        SID.
                        */
                        if (do_delt(&gpkt,goods,c_sid)) {
                                fclose(gpkt.p_iop);
-                               infile_err =| CORRUPT_ERR;
+                               infile_err |= CORRUPT_ERR;
                                return;
                        }
 
                                return;
                        }
 
@@ -266,36 +266,36 @@ char      *c_name;
                                        NONBLANK(l);
                                        repl(l,'\n','\0');
                                        if (*l == TYPEFLAG) {
                                        NONBLANK(l);
                                        repl(l,'\n','\0');
                                        if (*l == TYPEFLAG) {
-                                               l =+ 2;
+                                               l += 2;
                                                if (equal(c_type,l))
                                                        goodt++;
                                        }
                                        else if (*l == MODFLAG) {
                                                hadmflag++;
                                                if (equal(c_type,l))
                                                        goodt++;
                                        }
                                        else if (*l == MODFLAG) {
                                                hadmflag++;
-                                               l =+ 2;
+                                               l += 2;
                                                if (equal(c_name,l))
                                                        goodn++;
                                        }
                                }
                                if (*(--l) != BUSERTXT) {
                                        fclose(gpkt.p_iop);
                                                if (equal(c_name,l))
                                                        goodn++;
                                        }
                                }
                                if (*(--l) != BUSERTXT) {
                                        fclose(gpkt.p_iop);
-                                       infile_err =| CORRUPT_ERR;
+                                       infile_err |= CORRUPT_ERR;
                                        return;
                                }
                                /*
                                check if 'y' flag matched '-y' arg value.
                                */
                                if (!goodt && HADY)
                                        return;
                                }
                                /*
                                check if 'y' flag matched '-y' arg value.
                                */
                                if (!goodt && HADY)
-                                       infile_err =| TYPE_ERR;
+                                       infile_err |= TYPE_ERR;
                                /*
                                check if 'm' flag matched '-m' arg value.
                                */
                                if (HADM && !hadmflag) {
                                        if (!equal(auxf(sname(c_path),'g'),c_name))
                                /*
                                check if 'm' flag matched '-m' arg value.
                                */
                                if (HADM && !hadmflag) {
                                        if (!equal(auxf(sname(c_path),'g'),c_name))
-                                               infile_err =| NAME_ERR;
+                                               infile_err |= NAME_ERR;
                                }
                                else if (HADM && hadmflag && !goodn)
                                }
                                else if (HADM && hadmflag && !goodn)
-                                               infile_err =| NAME_ERR;
+                                               infile_err |= NAME_ERR;
                        }
                        else read_to(BUSERTXT,&gpkt);
                        read_to(EUSERTXT,&gpkt);
                        }
                        else read_to(BUSERTXT,&gpkt);
                        read_to(EUSERTXT,&gpkt);
@@ -456,13 +456,13 @@ register struct packet *pkt;
        if ((n = fgets(pkt->p_line,sizeof(pkt->p_line),pkt->p_iop)) != NULL) {
                pkt->p_slnno++;
                for (p = pkt->p_line; *p; )
        if ((n = fgets(pkt->p_line,sizeof(pkt->p_line),pkt->p_iop)) != NULL) {
                pkt->p_slnno++;
                for (p = pkt->p_line; *p; )
-                       pkt->p_chash =+ *p++;
+                       pkt->p_chash += *p++;
        }
        else {
                if (!pkt->p_chkeof)
        }
        else {
                if (!pkt->p_chkeof)
-                       infile_err =| CORRUPT_ERR;
+                       infile_err |= CORRUPT_ERR;
                if (pkt->do_chksum && (pkt->p_chash ^ pkt->p_ihash)&0xFFFF)
                if (pkt->do_chksum && (pkt->p_chash ^ pkt->p_ihash)&0xFFFF)
-                       infile_err =| CORRUPT_ERR;
+                       infile_err |= CORRUPT_ERR;
        }
        return(n);
 }
        }
        return(n);
 }
@@ -498,7 +498,7 @@ register struct packet *pkt;
                        continue;
                else {
                        if (!((iord = *p++) == INS || iord == DEL || iord == END)) {
                        continue;
                else {
                        if (!((iord = *p++) == INS || iord == DEL || iord == END)) {
-                               infile_err =| CORRUPT_ERR;
+                               infile_err |= CORRUPT_ERR;
                                return(0);
                        }
                        NONBLANK(p);
                                return(0);
                        }
                        NONBLANK(p);
@@ -512,7 +512,7 @@ register struct packet *pkt;
                }
        }
        if (pkt->p_q)
                }
        }
        if (pkt->p_q)
-               infile_err =| CORRUPT_ERR;
+               infile_err |= CORRUPT_ERR;
        return(0);
 }
 
        return(0);
 }
 
@@ -529,7 +529,7 @@ int iord;
                if (cur->q_sernum <= ser)
                        break;
        if (cur->q_sernum == ser)
                if (cur->q_sernum <= ser)
                        break;
        if (cur->q_sernum == ser)
-               infile_err =| CORRUPT_ERR;
+               infile_err |= CORRUPT_ERR;
        prev->q_next = q = alloc(sizeof(*q));
        q->q_next = cur;
        q->q_sernum = ser;
        prev->q_next = q = alloc(sizeof(*q));
        q->q_next = cur;
        q->q_sernum = ser;
@@ -562,7 +562,7 @@ int ser;
                setkeep(pkt);
        }
        else
                setkeep(pkt);
        }
        else
-               infile_err =| CORRUPT_ERR;
+               infile_err |= CORRUPT_ERR;
 }
 
 
 }
 
 
@@ -671,7 +671,7 @@ register char *d_sid;
        if (pkt->p_line[1] != BUSERNAM)
                return(1);
        if (HADR && !goods && !(infile_err & INVALSID_ERR))
        if (pkt->p_line[1] != BUSERNAM)
                return(1);
        if (HADR && !goods && !(infile_err & INVALSID_ERR))
-               infile_err =| NONEXSID_ERR;
+               infile_err |= NONEXSID_ERR;
        return(0);
 }
 
        return(0);
 }