diff options
author | Dan Cross <cross@gajendra.net> | 2020-01-10 14:44:21 +0000 |
---|---|---|
committer | Dan Cross <cross@gajendra.net> | 2020-01-10 14:54:30 +0000 |
commit | fa325e9b42b0bdfb48857d1958d9fb7ceac55151 (patch) | |
tree | 81d26256d152435135bcb1ae43121979a49f5f2b /src/cmd/postscript | |
parent | 77a0a5b5194d4441c86de097f2aae297cb75e2c2 (diff) | |
download | plan9port-fa325e9b42b0bdfb48857d1958d9fb7ceac55151.tar.gz plan9port-fa325e9b42b0bdfb48857d1958d9fb7ceac55151.tar.bz2 plan9port-fa325e9b42b0bdfb48857d1958d9fb7ceac55151.zip |
Trivial changes: whitespace and modes.
Remote whitespace at the ends of lines.
Remove blank lines from the ends of files.
Change modes on source files so that they
are not executable.
Signed-off-by: Dan Cross <cross@gajendra.net>
Diffstat (limited to 'src/cmd/postscript')
25 files changed, 28 insertions, 45 deletions
diff --git a/src/cmd/postscript/common/bbox.c b/src/cmd/postscript/common/bbox.c index b6807a4d..2dc55cbb 100644 --- a/src/cmd/postscript/common/bbox.c +++ b/src/cmd/postscript/common/bbox.c @@ -259,4 +259,3 @@ concat(m1) } /* End of concat */ /*****************************************************************************/ - diff --git a/src/cmd/postscript/common/comments.h b/src/cmd/postscript/common/comments.h index 6b409cad..0bbf5902 100644 --- a/src/cmd/postscript/common/comments.h +++ b/src/cmd/postscript/common/comments.h @@ -124,4 +124,3 @@ #define ENDPAGE "%%EndPage:" #define FORMSPERPAGE "%%FormsPerPage:" #define VERSION "%%Version:" - diff --git a/src/cmd/postscript/common/common.h b/src/cmd/postscript/common/common.h index f49f6f1f..7b267668 100644 --- a/src/cmd/postscript/common/common.h +++ b/src/cmd/postscript/common/common.h @@ -45,4 +45,3 @@ void *galloc(void *, int, char *); void pagelist(char *); int safe_tmpnam(char*); - diff --git a/src/cmd/postscript/common/ext.h b/src/cmd/postscript/common/ext.h index 77635b6b..75bea5b5 100644 --- a/src/cmd/postscript/common/ext.h +++ b/src/cmd/postscript/common/ext.h @@ -33,7 +33,7 @@ extern void interrupt(int); extern int cat(char*); extern void concat(double*); -/* +/* * extern char *tempnam(char*,char*); * extern char *malloc(); * extern char *calloc(); diff --git a/src/cmd/postscript/common/gen.h b/src/cmd/postscript/common/gen.h index dffeb957..1553c2c4 100644 --- a/src/cmd/postscript/common/gen.h +++ b/src/cmd/postscript/common/gen.h @@ -66,4 +66,3 @@ extern char* safe_tempnam(char*, char*); #define ABS(A) ((A) >= 0 ? (A) : -(A)) #define MIN(A, B) ((A) < (B) ? (A) : (B)) #define MAX(A, B) ((A) > (B) ? (A) : (B)) - diff --git a/src/cmd/postscript/common/glob.c b/src/cmd/postscript/common/glob.c index 2826f4e5..31de6b4d 100644 --- a/src/cmd/postscript/common/glob.c +++ b/src/cmd/postscript/common/glob.c @@ -26,4 +26,3 @@ double pagewidth = PAGEWIDTH; int reading = UTFENCODING; /* input */ int writing = WRITING; /* and output encoding */ - diff --git a/src/cmd/postscript/common/misc.c b/src/cmd/postscript/common/misc.c index 28120ea5..81444465 100644 --- a/src/cmd/postscript/common/misc.c +++ b/src/cmd/postscript/common/misc.c @@ -238,4 +238,3 @@ void interrupt(sig) } /* End of interrupt */ /*****************************************************************************/ - diff --git a/src/cmd/postscript/common/path.h b/src/cmd/postscript/common/path.h index f2019c1e..6e456bb2 100644 --- a/src/cmd/postscript/common/path.h +++ b/src/cmd/postscript/common/path.h @@ -29,4 +29,3 @@ #define FONTDIR "#9/troff/font" #define POSTLIBDIR "#9/postscript/prologues" #define TEMPDIR "/var/tmp" - diff --git a/src/cmd/postscript/common/request.c b/src/cmd/postscript/common/request.c index ba956d57..2e96093b 100644 --- a/src/cmd/postscript/common/request.c +++ b/src/cmd/postscript/common/request.c @@ -127,4 +127,3 @@ dumprequest(want, file, fp_out) } /* End of dumprequest */ /*****************************************************************************/ - diff --git a/src/cmd/postscript/common/request.h b/src/cmd/postscript/common/request.h index 25d94d01..6898ffd0 100644 --- a/src/cmd/postscript/common/request.h +++ b/src/cmd/postscript/common/request.h @@ -19,4 +19,3 @@ typedef struct { int page; char *file; } Request; - diff --git a/src/cmd/postscript/download/download.c b/src/cmd/postscript/download/download.c index 31aa1b3b..4c8f6ffb 100644 --- a/src/cmd/postscript/download/download.c +++ b/src/cmd/postscript/download/download.c @@ -565,4 +565,3 @@ Map *allocate(ptr, num) } /* End of allocate */ /*****************************************************************************/ - diff --git a/src/cmd/postscript/download/download.h b/src/cmd/postscript/download/download.h index f88cc57a..3e8ac6ff 100644 --- a/src/cmd/postscript/download/download.h +++ b/src/cmd/postscript/download/download.h @@ -11,4 +11,3 @@ typedef struct map { } Map; Map *allocate(); - diff --git a/src/cmd/postscript/misc/ibmfont.c b/src/cmd/postscript/misc/ibmfont.c index 49736d6f..99d2f64c 100644 --- a/src/cmd/postscript/misc/ibmfont.c +++ b/src/cmd/postscript/misc/ibmfont.c @@ -8,7 +8,7 @@ * * where font.ibm is the font file, exactly as it came over from an IBM PC, * and font.unix is equivalent host resident font file usable on Unix systems. - * + * */ #include <stdio.h> @@ -212,7 +212,7 @@ asciitext(count) ch = '\n'; putc(ch, fp_out); } /* End for */ - + } /* End of asciitext */ /*****************************************************************************/ @@ -238,7 +238,7 @@ hexdata(count) if ( (++n % 40) == 0 ) putc('\n', fp_out); } /* End for */ - + } /* End of hexdata */ /*****************************************************************************/ @@ -263,7 +263,7 @@ getint() return(val); -} /* End of getint */ +} /* End of getint */ /*****************************************************************************/ @@ -293,4 +293,3 @@ error(kind, mesg, a1, a2, a3) } /* End of error */ /*****************************************************************************/ - diff --git a/src/cmd/postscript/misc/laserbar.c b/src/cmd/postscript/misc/laserbar.c index 7b45e667..7818fc1d 100644 --- a/src/cmd/postscript/misc/laserbar.c +++ b/src/cmd/postscript/misc/laserbar.c @@ -13,13 +13,13 @@ static int code39[256] = { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, /* sp ! " # $ % & ' */ - 0304, 0, 0, 0, 0250, 0052, 0, 0, + 0304, 0, 0, 0, 0250, 0052, 0, 0, /* ( ) * + , - - / */ 0, 0, 0224, 0212, 0, 0205, 0604, 0242, /* 0 1 2 3 4 5 6 7 */ 0064, 0441, 0141, 0540, 0061, 0460, 0160, 0045, /* 8 9 : ; < = > ? */ - 0444, 0144, 0, 0, 0, 0, 0, 0, + 0444, 0144, 0, 0, 0, 0, 0, 0, /* @ A B C D E F G */ 0, 0411, 0111, 0510, 0031, 0430, 0130, 0015, /* H I J K L M N O */ diff --git a/src/cmd/postscript/misc/macfont.c b/src/cmd/postscript/misc/macfont.c index 59244a19..d0c9cb78 100644 --- a/src/cmd/postscript/misc/macfont.c +++ b/src/cmd/postscript/misc/macfont.c @@ -8,7 +8,7 @@ * * where font.mac is the font file, exactly as it came over from a Macintosh, * and font.unix is equivalent host resident font file usable on Unix systems. - * + * */ #include <stdio.h> @@ -215,7 +215,7 @@ asciitext(count) ch = '\n'; putc(ch, fp_out); } /* End for */ - + } /* End of asciitext */ /*****************************************************************************/ @@ -241,7 +241,7 @@ hexdata(count) if ( (++n % 40) == 0 ) putc('\n', fp_out); } /* End for */ - + } /* End of hexdata */ /*****************************************************************************/ @@ -265,7 +265,7 @@ getint() return(val); -} /* End of getint */ +} /* End of getint */ /*****************************************************************************/ @@ -296,4 +296,3 @@ error(kind, mesg, a1, a2, a3) } /* End of error */ /*****************************************************************************/ - diff --git a/src/cmd/postscript/misc/pscrypt.c b/src/cmd/postscript/misc/pscrypt.c index 1715288b..520daf33 100644 --- a/src/cmd/postscript/misc/pscrypt.c +++ b/src/cmd/postscript/misc/pscrypt.c @@ -332,4 +332,3 @@ Getc(fp) } /* End of Getc */ /*****************************************************************************/ - diff --git a/src/cmd/postscript/postreverse/postreverse.c b/src/cmd/postscript/postreverse/postreverse.c index d99124d5..56310520 100644 --- a/src/cmd/postscript/postreverse/postreverse.c +++ b/src/cmd/postscript/postreverse/postreverse.c @@ -364,7 +364,7 @@ moreprolog(str) * up being copied to the output file and FALSE will be returned to the caller. * The first call (made from reverse()) looks for ENDPROLOG. Any other call comes * from readpages() and will be looking for the ENDSETUP comment. - * + * */ len = strlen(FORMSPERPAGE); @@ -541,4 +541,3 @@ trailer() } /* End of trailer */ /*****************************************************************************/ - diff --git a/src/cmd/postscript/postreverse/postreverse.h b/src/cmd/postscript/postreverse/postreverse.h index edae7a27..a78ff4e8 100644 --- a/src/cmd/postscript/postreverse/postreverse.h +++ b/src/cmd/postscript/postreverse/postreverse.h @@ -18,4 +18,3 @@ typedef struct { */ char *copystdin(); - diff --git a/src/cmd/postscript/tr2post/Bgetfield.c b/src/cmd/postscript/tr2post/Bgetfield.c index 5e49e55e..f9fbfd76 100644 --- a/src/cmd/postscript/tr2post/Bgetfield.c +++ b/src/cmd/postscript/tr2post/Bgetfield.c @@ -22,7 +22,7 @@ Bskipws(Biobuf *bp) { do { r = Bgetrune(bp); if (r == '\n') inputlineno++; - sindex++; + sindex++; } while (r>=0 && isspace(r)); if (r<0) { return(-1); @@ -49,7 +49,7 @@ asc2dig(char c, int base) { } /* get a string of type: "d" for decimal integer, "u" for unsigned, - * "s" for string", "c" for char, + * "s" for string", "c" for char, * return the number of characters gotten for the field. If nothing * was gotten and the end of file was reached, a negative value * from the Bgetrune is returned. @@ -86,7 +86,7 @@ Bgetfield(Biobuf *bp, int type, void *thing, int size) { case '0': base = 8; continue; - default: + default: break; } break; @@ -96,7 +96,7 @@ Bgetfield(Biobuf *bp, int type, void *thing, int size) { continue; } } - if ((dig = asc2dig(r, base)) == -1) bailout = TRUE; + if ((dig = asc2dig(r, base)) == -1) bailout = TRUE; else n = dig + (n * base); } if (r < 0) return(-1); @@ -118,7 +118,7 @@ Bgetfield(Biobuf *bp, int type, void *thing, int size) { continue; } } - if ((dig = asc2dig(r, base)) == -1) bailout = TRUE; + if ((dig = asc2dig(r, base)) == -1) bailout = TRUE; else u = dig + (n * base); } *(int *)thing = u; diff --git a/src/cmd/postscript/tr2post/chartab.c b/src/cmd/postscript/tr2post/chartab.c index 11d1ae85..4b4f4ef0 100644 --- a/src/cmd/postscript/tr2post/chartab.c +++ b/src/cmd/postscript/tr2post/chartab.c @@ -272,7 +272,7 @@ readtroffmetric(char *fontname, int trindex) { if (*cp == 0) *cp = galloc(0, sizeof(struct charent), "readtroffmetric:charent"); (*cp)->postfontid = thisfont; - (*cp)->postcharid = thischar; + (*cp)->postcharid = thischar; (*cp)->troffcharwidth = ntoken; (*cp)->name = galloc(0, 2, "readtroffmetric: char name"); (*cp)->next = 0; @@ -283,7 +283,7 @@ readtroffmetric(char *fontname, int trindex) { line++; break; } - if (!errorflg) { + if (!errorflg) { line++; } } while(!errorflg && rv>=0); @@ -351,7 +351,7 @@ flush: } if (*cp == 0) *cp = galloc(0, sizeof(struct charent), "readtroffmetric:charent"); (*cp)->postfontid = RUNEGETGROUP(charnum); - (*cp)->postcharid = RUNEGETCHAR(charnum); + (*cp)->postcharid = RUNEGETCHAR(charnum); (*cp)->troffcharwidth = width; (*cp)->name = galloc(0, strlen(stoken)+1, "readtroffmetric: char name"); (*cp)->next = 0; diff --git a/src/cmd/postscript/tr2post/devcntl.c b/src/cmd/postscript/tr2post/devcntl.c index f0a9800a..ad3abbaf 100644 --- a/src/cmd/postscript/tr2post/devcntl.c +++ b/src/cmd/postscript/tr2post/devcntl.c @@ -175,4 +175,3 @@ devcntl(Biobuf *inp) { while ((c = Bgetc(inp)) != '\n' && c != Beof); inputlineno++; } - diff --git a/src/cmd/postscript/tr2post/draw.c b/src/cmd/postscript/tr2post/draw.c index a7f6b223..b8bda78d 100644 --- a/src/cmd/postscript/tr2post/draw.c +++ b/src/cmd/postscript/tr2post/draw.c @@ -220,7 +220,7 @@ drawpath(char *buf, int copy) { * was expected to be legitimate PostScript that manipulated the current path. * The old escape sequence will be supported for a while (for Ravi), and always * call this routine with copy set to TRUE. - * + * * */ diff --git a/src/cmd/postscript/tr2post/readDESC.c b/src/cmd/postscript/tr2post/readDESC.c index 366bae70..90b7b882 100644 --- a/src/cmd/postscript/tr2post/readDESC.c +++ b/src/cmd/postscript/tr2post/readDESC.c @@ -71,7 +71,7 @@ readDESC(void) { printdesclang=galloc(printdesclang, strlen(token)+1, "readdesc:"); strcpy(printdesclang, token); if (debug) Bprint(Bstderr, "PDL %s\n", token); - break; + break; case 1: encoding=galloc(encoding, strlen(token)+1, "readdesc:"); strcpy(encoding, token); @@ -85,7 +85,7 @@ readDESC(void) { } fontmnt = atoi(token) + 1; fontmtab = galloc(fontmtab, fontmnt*sizeof(char *), "readdesc:"); - + for (i=0; i<fontmnt; i++) fontmtab[i] = 0; fontindex = 0; diff --git a/src/cmd/postscript/tr2post/tr2post.c b/src/cmd/postscript/tr2post/tr2post.c index 5ca1b328..3f28e8d5 100644 --- a/src/cmd/postscript/tr2post/tr2post.c +++ b/src/cmd/postscript/tr2post/tr2post.c @@ -139,7 +139,7 @@ main(int argc, char *argv[]) { } atexit(cleanup); Bstdout = bstdout; /* &bstdout->Biobufhdr; */ - + ARGBEGIN{ case 'a': /* aspect ratio */ aspectratio = atof(ARGF()); @@ -239,7 +239,7 @@ main(int argc, char *argv[]) { exits("read"); } finish(); - + exits(""); return 0; } diff --git a/src/cmd/postscript/tr2post/utils.c b/src/cmd/postscript/tr2post/utils.c index f914a1c8..7f00dbd4 100644 --- a/src/cmd/postscript/tr2post/utils.c +++ b/src/cmd/postscript/tr2post/utils.c @@ -47,7 +47,7 @@ hmot(int x) { if (delta == troffontab[curtrofffontid].spacewidth*fontsize/10 && isinstring()) { if (pageon()) runeout(' '); } else { - if (pageon()) { + if (pageon()) { endstring(); /* Bprint(Bstdout, " %d 0 rmoveto ", delta); */ /* Bprint(Bstdout, " %d %d m ", hpos+x, vpos); */ @@ -160,7 +160,7 @@ if (debug) fprint(2, " looking through special fonts: trying %s\n", troffontab[f if (*cp != 0) goto foundit; } } - + if (*cp == 0) { error(WARNING, "cannot find glyph, rune=0x%x stoken=<%s> troff font %s\n", rune, stoken, troffontab[curtrofffontid].trfontid); @@ -174,7 +174,7 @@ foundit: Bprint(Bstderr, "runeout(0x%x)<%C> postfontid=0x%x postcharid=0x%x troffcharwidth=%d\n", rune, rune, (*cp)->postfontid, (*cp)->postcharid, (*cp)->troffcharwidth); } - + tfp = &(troffontab[fontid]); for (i=0; i<tfp->psfmapsize; i++) { psfp = &(tfp->psfmap[i]); |