summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--Build/source/texk/dvipsk/ChangeLog7
-rw-r--r--Build/source/texk/dvipsk/afm2tfm.c70
-rw-r--r--Build/source/texk/dvipsk/bbox.c2
-rw-r--r--Build/source/texk/dvipsk/color.c12
-rw-r--r--Build/source/texk/dvipsk/dosection.c30
-rw-r--r--Build/source/texk/dvipsk/dospecial.c34
-rw-r--r--Build/source/texk/dvipsk/download.c12
-rw-r--r--Build/source/texk/dvipsk/drawPS.c4
-rw-r--r--Build/source/texk/dvipsk/dvips.c44
-rw-r--r--Build/source/texk/dvipsk/emspecial.c40
-rw-r--r--Build/source/texk/dvipsk/finclude.c14
-rw-r--r--Build/source/texk/dvipsk/flib.c22
-rw-r--r--Build/source/texk/dvipsk/fontdef.c4
-rw-r--r--Build/source/texk/dvipsk/header.c4
-rw-r--r--Build/source/texk/dvipsk/hps.c16
-rw-r--r--Build/source/texk/dvipsk/loadfont.c34
-rw-r--r--Build/source/texk/dvipsk/makefont.c36
-rw-r--r--Build/source/texk/dvipsk/output.c216
-rw-r--r--Build/source/texk/dvipsk/pprescan.c12
-rw-r--r--Build/source/texk/dvipsk/prescan.c26
-rw-r--r--Build/source/texk/dvipsk/repack.c2
-rw-r--r--Build/source/texk/dvipsk/resident.c16
-rw-r--r--Build/source/texk/dvipsk/scanpage.c16
-rw-r--r--Build/source/texk/dvipsk/search.c2
-rw-r--r--Build/source/texk/dvipsk/skippage.c6
-rw-r--r--Build/source/texk/dvipsk/tfmload.c12
-rw-r--r--Build/source/texk/dvipsk/virtualfont.c12
27 files changed, 356 insertions, 349 deletions
diff --git a/Build/source/texk/dvipsk/ChangeLog b/Build/source/texk/dvipsk/ChangeLog
index b43d556fb2f..e37946d28a0 100644
--- a/Build/source/texk/dvipsk/ChangeLog
+++ b/Build/source/texk/dvipsk/ChangeLog
@@ -1,3 +1,10 @@
+2010-05-10 Karl Berry <karl@tug.org>
+
+ * all files: remove useless casts to void.
+
+ * dosection.c (dosection),
+ * dospecial.c (dospecial): use snprintf, just in case.
+
2010-05-07 Akira Kakuto <kakuto@fuk.kindai.ac.jp>
* output.c: correct wrong boundary values of characters.
diff --git a/Build/source/texk/dvipsk/afm2tfm.c b/Build/source/texk/dvipsk/afm2tfm.c
index 0d6da9bb746..1c851cac63a 100644
--- a/Build/source/texk/dvipsk/afm2tfm.c
+++ b/Build/source/texk/dvipsk/afm2tfm.c
@@ -239,14 +239,14 @@ char titlebuf[500];
static void
error(const char *s)
{
- (void)fprintf(stderr, "%s\n", s);
+ fprintf(stderr, "%s\n", s);
if (obuffer[0]) {
- (void)fprintf(stderr, "%s\n", obuffer);
+ fprintf(stderr, "%s\n", obuffer);
while (param > buffer) {
- (void)fprintf(stderr, " ");
+ fprintf(stderr, " ");
param--;
}
- (void)fprintf(stderr, "^\n");
+ fprintf(stderr, "^\n");
}
if (*s == '!')
exit(1);
@@ -285,7 +285,7 @@ texlive_getline(void) {
}
}
*p = 0;
- (void)strcpy(obuffer, buffer);
+ strcpy(obuffer, buffer);
if (p == buffer && c == EOF)
return(0);
else
@@ -337,7 +337,7 @@ static char *
newstring(char *s)
{
char *q = mymalloc((unsigned long)(strlen(s) + 1));
- (void)strcpy(q, s);
+ strcpy(q, s);
return q;
}
@@ -457,7 +457,7 @@ static void
expect(const char *s)
{
if (strcmp(paramstring(), s) != 0) {
- (void)fprintf(stderr, "%s expected: ", s);
+ fprintf(stderr, "%s expected: ", s);
error("! syntax error");
}
}
@@ -881,8 +881,8 @@ int lf, lh, nw, nh, nd, ni, nl, nk, ne, np;
static void
write16(register short what)
{
- (void)fputc(what >> 8, tfmout);
- (void)fputc(what & 255, tfmout);
+ fputc(what >> 8, tfmout);
+ fputc(what & 255, tfmout);
}
static void
@@ -1152,7 +1152,7 @@ writesarr(long *what, int len)
i = len;
while (i) {
*p = scale(*p);
- (void)scale(*p); /* need this kludge for some compilers */
+ scale(*p); /* need this kludge for some compilers */
p++;
i--;
}
@@ -1545,13 +1545,13 @@ usage(FILE *f)
static void
usage(FILE *f)
{
- (void)fprintf(f,
+ fprintf(f,
"afm2tfm 8.1, Copyright 1990-97 by Radical Eye Software\n");
- (void)fprintf(f,
+ fprintf(f,
"Usage: afm2tfm foo[.afm] [-O] [-u] [-v|-V bar[.vpl]]\n");
- (void)fprintf(f,
+ fprintf(f,
" [-e expansion] [-s slant] [-c capheight]\n");
- (void)fprintf(f,
+ fprintf(f,
" [-p|-t|-T encodingfile] [foo[.tfm]]\n");
}
#endif
@@ -1588,10 +1588,10 @@ openfiles(int argc, char **argv)
snprintf(titlebuf, sizeof(titlebuf), "%s %s", argv[0], argv[1]);
#endif
#endif
- (void)strcpy(inname, argv[1]);
+ strcpy(inname, argv[1]);
#ifdef KPATHSEA
if (find_suffix(inname) == NULL)
- (void)strcat(inname, ".afm");
+ strcat(inname, ".afm");
#else
lastext = -1;
for (i=0; inname[i]; i++)
@@ -1599,7 +1599,7 @@ openfiles(int argc, char **argv)
lastext = i;
else if (inname[i] == '/' || inname[i] == ':')
lastext = -1;
- if (lastext == -1) (void)strcat(inname, ".afm");
+ if (lastext == -1) strcat(inname, ".afm");
#endif
while (argc>2 && *argv[2]=='-') {
arginc = 2;
@@ -1610,10 +1610,10 @@ openfiles(int argc, char **argv)
case 'V': makevpl++;
case 'v': makevpl++;
CHECKARG3
- (void)strcpy(outname, argv[3]);
+ strcpy(outname, argv[3]);
#ifdef KPATHSEA
if (find_suffix(outname) == NULL)
- (void)strcat(outname, ".vpl");
+ strcat(outname, ".vpl");
#else
lastext = -1;
for (i=0; outname[i]; i++)
@@ -1621,7 +1621,7 @@ case 'v': makevpl++;
lastext = i;
else if (outname[i] == '/' || outname[i] == ':')
lastext = -1;
- if (lastext == -1) (void)strcat(outname, ".vpl");
+ if (lastext == -1) strcat(outname, ".vpl");
#endif
#ifndef VMCMS
#ifndef ATARIST
@@ -1687,20 +1687,20 @@ default: fprintf(stderr, "Unknown option %s %s ignored.\n", argv[2], argv[3]);
if ((afmin=fopen(inname, "r"))==NULL)
error("! can't open afm input file");
#endif /* KPATHSEA */
- (void)SET_BINARY(fileno(afmin));
+ SET_BINARY(fileno(afmin));
if (argc>3 || (argc==3 && *argv[2]=='-')) {
error("! need at most two non-option arguments");
usage(stderr);
}
- if (argc == 2) (void)strcpy(outname, inname);
- else (void)strcpy(outname, argv[2]);
+ if (argc == 2) strcpy(outname, inname);
+ else strcpy(outname, argv[2]);
#ifdef KPATHSEA
if ((p = find_suffix(outname)) != NULL)
*(p-1) = 0;
- (void)strcat(outname, ".tfm");
+ strcat(outname, ".tfm");
if (tfmout == NULL && (tfmout=fopen(outname, WRITEBIN))==NULL)
error("! can't open tfm output file");
/*
@@ -1727,7 +1727,7 @@ default: fprintf(stderr, "Unknown option %s %s ignored.\n", argv[2], argv[3]);
}
if (lastext == -1) {
lastext = strlen(outname);
- (void)strcat(outname, ".tfm");
+ strcat(outname, ".tfm");
}
if (tfmout == NULL && (tfmout=fopen(outname, WRITEBIN))==NULL)
error("! can't open tfm output file");
@@ -1979,7 +1979,7 @@ readencoding(char *enc)
#else
afmin = fopen(enc, "r");
#endif
- (void)SET_BINARY(fileno(afmin));
+ SET_BINARY(fileno(afmin));
param = 0;
if (afmin == 0)
#ifdef KPATHSEA
@@ -2029,25 +2029,25 @@ readencoding(char *enc)
static void
conspsfonts(void) {
#ifndef VMCMS
- (void)printf("%s %s", outname,
+ printf("%s %s", outname,
fontname);
#else /* VM/CMS: fontname is ascii, so we use ebfontname */
- (void)printf("%s %s", outname,
+ printf("%s %s", outname,
ebfontname);
#endif
if (slantparam || efactorparam || inenname) {
- (void)printf(" \"");
+ printf(" \"");
if (slantparam)
- (void)printf(" %s SlantFont", slantparam);
+ printf(" %s SlantFont", slantparam);
if (efactorparam)
- (void)printf(" %s ExtendFont", efactorparam);
+ printf(" %s ExtendFont", efactorparam);
if (inenname)
- (void)printf(" %s ReEncodeFont", inencoding->name);
- (void)printf(" \"");
+ printf(" %s ReEncodeFont", inencoding->name);
+ printf(" \"");
if (inenname)
- (void)printf(" <%s", inenname);
+ printf(" <%s", inenname);
}
- (void)printf("\n");
+ printf("\n");
}
#ifndef VMS
int
diff --git a/Build/source/texk/dvipsk/bbox.c b/Build/source/texk/dvipsk/bbox.c
index d7ee108d310..eeab1585a69 100644
--- a/Build/source/texk/dvipsk/bbox.c
+++ b/Build/source/texk/dvipsk/bbox.c
@@ -171,7 +171,7 @@ bbtfmload(register fontdesctype *curfnt)
for (i=0; i<ns; i++)
tfm32();
slant = tfm32();
- (void)fclose(tfmfile);
+ fclose(tfmfile);
if (id == 9 || id == 11) {
for (i=0; i<MAX_2BYTES_CODE+1; i++) {
diff --git a/Build/source/texk/dvipsk/color.c b/Build/source/texk/dvipsk/color.c
index 5a0977f590d..d4b0867320c 100644
--- a/Build/source/texk/dvipsk/color.c
+++ b/Build/source/texk/dvipsk/color.c
@@ -166,13 +166,13 @@ resetcolorstack(char * p, int outtops)
q--;
if (q > cstack && outtops == 0) {
#ifdef SHORTINT
- (void)fprintf(stderr, "You've mistakenly made a global color change ");
- (void)fprintf(stderr, "to %s within nested colors\n", p);
- (void)fprintf(stderr, "on page %ld. Will try to recover.\n", pagenum);
+ fprintf(stderr, "You've mistakenly made a global color change ");
+ fprintf(stderr, "to %s within nested colors\n", p);
+ fprintf(stderr, "on page %ld. Will try to recover.\n", pagenum);
#else /* ~SHORTINT */
- (void)fprintf(stderr, "You've mistakenly made a global color change ");
- (void)fprintf(stderr, "to %s within nested colors\n", p);
- (void)fprintf(stderr, "on page %d. Will try to recover.\n", pagenum);
+ fprintf(stderr, "You've mistakenly made a global color change ");
+ fprintf(stderr, "to %s within nested colors\n", p);
+ fprintf(stderr, "on page %d. Will try to recover.\n", pagenum);
#endif /* ~SHORTINT */
}
csp = cstack;
diff --git a/Build/source/texk/dvipsk/dosection.c b/Build/source/texk/dvipsk/dosection.c
index 98a0fde7606..c7987130e49 100644
--- a/Build/source/texk/dvipsk/dosection.c
+++ b/Build/source/texk/dvipsk/dosection.c
@@ -72,11 +72,11 @@ dosection(sectiontype *s, int c)
c--;
prevptr = s->bos;
if (! reverse)
- (void)fseek(dvifile, (long)prevptr, 0);
+ fseek(dvifile, (long)prevptr, 0);
np = s->numpages;
while (np-- != 0) {
if (reverse)
- (void)fseek(dvifile, (long)prevptr, 0);
+ fseek(dvifile, (long)prevptr, 0);
pagenum = signedquad();
if ((evenpages && (pagenum & 1)) || (oddpages && (pagenum & 1)==0) ||
(pagelist && !InPageList(pagenum))) {
@@ -113,11 +113,11 @@ dosection(sectiontype *s, int c)
}
prettycolumn += i + 1;
#ifdef SHORTINT
- (void)fprintf(stderr, "[%ld", pagenum);
+ fprintf(stderr, "[%ld", pagenum);
#else /* ~SHORTINT */
- (void)fprintf(stderr, "[%d", pagenum);
+ fprintf(stderr, "[%d", pagenum);
#endif /* ~SHORTINT */
- (void)fflush(stderr);
+ fflush(stderr);
}
skipover(36);
prevptr = signedquad()+1;
@@ -126,34 +126,34 @@ dosection(sectiontype *s, int c)
if (pagecopies > 1)
thispage = ftell(dvifile);
} else {
- (void)fseek(dvifile, (long)thispage, 0);
+ fseek(dvifile, (long)thispage, 0);
if (prettycolumn + 1 > STDOUTSIZE) {
- (void)fprintf(stderr, "\n");
+ fprintf(stderr, "\n");
prettycolumn = 0;
}
- (void)fprintf(stderr, ".");
- (void)fflush(stderr);
+ fprintf(stderr, ".");
+ fflush(stderr);
prettycolumn++;
}
dopage();
}
if (! quiet) {
- (void)fprintf(stderr, "] ");
- (void)fflush(stderr);
+ fprintf(stderr, "] ");
+ fflush(stderr);
prettycolumn += 2;
}
if (! reverse)
- (void)skipnop();
+ skipnop();
}
}
if (! multiplesects && ! disablecomments) {
newline();
- (void)fprintf(bitfile, "%%%%Trailer\n");
+ fprintf(bitfile, "%%%%Trailer\n");
}
if (multiplesects) {
if (! disablecomments) {
newline();
- (void)fprintf(bitfile, "%%DVIPSSectionTrailer\n");
+ fprintf(bitfile, "%%DVIPSSectionTrailer\n");
}
cmdout("eos");
cmdout("end");
@@ -163,7 +163,7 @@ dosection(sectiontype *s, int c)
#endif
if (multiplesects && ! disablecomments) {
newline();
- (void)fprintf(bitfile, "%%DVIPSEndSection\n");
+ fprintf(bitfile, "%%DVIPSEndSection\n");
linepos = 0;
}
}
diff --git a/Build/source/texk/dvipsk/dospecial.c b/Build/source/texk/dvipsk/dospecial.c
index 721327f251d..ff8bbf2450b 100644
--- a/Build/source/texk/dvipsk/dospecial.c
+++ b/Build/source/texk/dvipsk/dospecial.c
@@ -51,12 +51,12 @@ specerror(const char *s)
static void
outputstring(register char *p)
{
- (void)putc('\n', bitfile);
+ putc('\n', bitfile);
while(*p) {
- (void)putc(*p, bitfile);
+ putc(*p, bitfile);
p++;
}
- (void)putc('\n', bitfile);
+ putc('\n', bitfile);
}
static void
@@ -67,23 +67,23 @@ trytobreakout(register char *p)
int lastc = 0;
i = 0;
- (void)putc('\n', bitfile);
+ putc('\n', bitfile);
if(*p == '%') {
while(*p) {
- (void)putc(*p, bitfile);
+ putc(*p, bitfile);
p++;
}
- (void)putc('\n', bitfile);
+ putc('\n', bitfile);
return;
}
while (*p) {
if (i > 65 && *p == ' ' && instring == 0) {
- (void)putc('\n', bitfile);
+ putc('\n', bitfile);
i = 0;
} else {
- (void)putc(*p, bitfile);
+ putc(*p, bitfile);
i++;
}
if (*p == '(' && lastc != '\\')
@@ -93,7 +93,7 @@ trytobreakout(register char *p)
lastc = *p;
p++;
}
- (void)putc('\n', bitfile);
+ putc('\n', bitfile);
}
static void
@@ -400,7 +400,7 @@ predospecial(integer numbytes, Boolean scanning)
p++;
#ifdef DEBUG
if (dd(D_SPECIAL))
- (void)fprintf(stderr, "Preprocessing special: %s\n", p);
+ fprintf(stderr, "Preprocessing special: %s\n", p);
#endif
/*
@@ -510,7 +510,7 @@ case 'h':
*r = 0;
}
if (strlen(q) > 0)
- (void)add_header_general(q, pre, post);
+ add_header_general(q, pre, post);
} else {
q = p; /* we will remove enclosing parentheses */
p = p + strlen(p) - 1;
@@ -518,7 +518,7 @@ case 'h':
p--;
p[1] = 0;
if (p >= q)
- (void)add_header(q);
+ add_header(q);
}
}
break;
@@ -558,7 +558,7 @@ case '!':
p++;
q = (struct bangspecial *)mymalloc((integer)
(sizeof(struct bangspecial) + strlen(p)));
- (void)strcpy(q->actualstuff, p);
+ strcpy(q->actualstuff, p);
q->next = bangspecials;
bangspecials = q;
usesspecial = 1;
@@ -628,7 +628,7 @@ if (HPS_FLAG && NEED_NEW_BOX) {
p++;
#ifdef DEBUG
if (dd(D_SPECIAL))
- (void)fprintf(stderr, "Processing special: %s\n", p);
+ fprintf(stderr, "Processing special: %s\n", p);
#endif
switch (*p) {
@@ -916,7 +916,7 @@ default:
case -1: /* for compatability with old conventions, we allow a file name
* to be given without the 'psfile=' keyword */
if (!psfile[0] && maccess(KeyStr)==0) /* yes we can read it */
- (void)strcpy(psfile,KeyStr);
+ strcpy(psfile,KeyStr);
else {
if (strlen(KeyStr) < 40) {
sprintf(errbuf,
@@ -936,7 +936,7 @@ default:
"psfile", ValStr);
specerror(errbuf);
}
- else (void)strcpy(psfile,ValStr);
+ else strcpy(psfile,ValStr);
task = tasks[j];
break;
default: /* most keywords are output as PostScript procedure calls */
@@ -955,7 +955,7 @@ default:
cmdout(cmdbuf);
}
}
- (void)sprintf(cmdbuf, "@%s", KeyStr);
+ sprintf(cmdbuf, "@%s", KeyStr);
cmdout(cmdbuf);
}
diff --git a/Build/source/texk/dvipsk/download.c b/Build/source/texk/dvipsk/download.c
index 8b408ee9ad4..ae4c4ef6fe1 100644
--- a/Build/source/texk/dvipsk/download.c
+++ b/Build/source/texk/dvipsk/download.c
@@ -257,10 +257,10 @@ download(charusetype *p, int psfont)
* Sorry this bug has been in here so long. -tgr
*/
fontscale = curfnt->scaledsize * conv;
- (void)sprintf(nextstring, "%g", fontscale);
+ sprintf(nextstring, "%g", fontscale);
cmdout(nextstring);
- (void)strcpy(nextstring, "/");
- (void)strcat(nextstring, rf->PSname);
+ strcpy(nextstring, "/");
+ strcat(nextstring, rf->PSname);
cmdout(nextstring);
/* end of changed section - Rob */
cmdout("rf");
@@ -509,7 +509,7 @@ downpsfont(charusetype *p, charusetype *all)
if(GridCount!=0 || extraGlyphs) {
newline();
if (! disablecomments)
- (void)fprintf(bitfile, "%%%%BeginFont: %s\n", rf->PSname);
+ fprintf(bitfile, "%%%%BeginFont: %s\n", rf->PSname);
#ifdef DOWNLOAD_USING_PDFTEX
if (!t1_subset_2(rf->Fontfile, grid, extraGlyphs))
#else
@@ -521,11 +521,11 @@ downpsfont(charusetype *p, charusetype *all)
fprintf(stderr, "\n");
prettycolumn = 0;
}
- (void)fprintf(stderr, "<%s>", realnameoffile);
+ fprintf(stderr, "<%s>", realnameoffile);
prettycolumn += strlen(realnameoffile) + 2;
}
if (! disablecomments)
- (void)fprintf(bitfile, "%%%%EndFont \n");
+ fprintf(bitfile, "%%%%EndFont \n");
}
}
diff --git a/Build/source/texk/dvipsk/drawPS.c b/Build/source/texk/dvipsk/drawPS.c
index b60ea6f78bb..5418bc0b76d 100644
--- a/Build/source/texk/dvipsk/drawPS.c
+++ b/Build/source/texk/dvipsk/drawPS.c
@@ -357,7 +357,7 @@ flushPath(int invis)
#ifdef DEBUG
if (dd(D_SPECIAL))
- (void)fprintf(stderr,
+ fprintf(stderr,
#ifdef SHORTINT
"flushpath(1): hh=%ld, vv=%ld, x=%lg, y=%lg, xPS=%lg, yPS=%lg\n",
#else /* ~SHORTINT */
@@ -374,7 +374,7 @@ flushPath(int invis)
for (i=2; i < pathLen; i++) {
#ifdef DEBUG
if (dd(D_SPECIAL))
- (void)fprintf(stderr,
+ fprintf(stderr,
#ifdef SHORTINT
"flushpath(%ld): hh=%ld, vv=%ld, x=%lg, y=%lg, xPS=%lg, yPS=%lg\n",
#else /* ~SHORTINT */
diff --git a/Build/source/texk/dvipsk/dvips.c b/Build/source/texk/dvipsk/dvips.c
index 1be2dd53070..4c5e48629f8 100644
--- a/Build/source/texk/dvipsk/dvips.c
+++ b/Build/source/texk/dvipsk/dvips.c
@@ -342,7 +342,7 @@ error_with_perror(const char *s, const char *fname)
if (prettycolumn > 0)
fprintf(stderr,"\n");
prettycolumn = 0;
- (void)fprintf(stderr, "%s: %s", progname, s);
+ fprintf(stderr, "%s: %s", progname, s);
if (fname) {
putc (' ', stderr);
perror (fname);
@@ -502,7 +502,7 @@ newstring(const char *s)
morestrings();
if (nextstring + l >= maxstring)
error("! out of string space");
- (void)strcpy(nextstring, s);
+ strcpy(nextstring, s);
q = nextstring;
nextstring += l + 1;
return(q);
@@ -781,7 +781,7 @@ case 'h' : case 'H' :
if (strcmp(p, "-") == 0)
headers_off = 1;
else
- (void)add_header(p);
+ add_header(p);
break;
case 'i':
sepfiles = (*p != '0');
@@ -1132,7 +1132,7 @@ default:
}
papsizes = (struct papsiz *)revlist((void *)papsizes);
if (queryoptions != 0) { /* get new options */
- (void)fprintf(stderr, "%s %s\n", banner, banner2);
+ fprintf(stderr, "%s %s\n", banner, banner2);
help(1);
queryargs();
if (qargc == 1)
@@ -1171,11 +1171,11 @@ default:
revpslists();
if (dvips_debug_flag) {
if (!quiet)
- (void)fprintf(stderr, "\n%s %s\n", banner, banner2);
+ fprintf(stderr, "\n%s %s\n", banner, banner2);
prettycolumn = 0;
} else {
if (!quiet)
- (void)fprintf(stderr, "%s %s\n", banner, banner2);
+ fprintf(stderr, "%s %s\n", banner, banner2);
}
if (*iname) {
dvifile = fopen(iname, READBIN);
@@ -1251,19 +1251,19 @@ default:
#ifdef DEBUG
if (dd(D_PATHS)) {
#ifdef SHORTINT
- (void)fprintf(stderr,"input file %s output file %s swmem %ld\n",
+ fprintf(stderr,"input file %s output file %s swmem %ld\n",
#else /* ~SHORTINT */
- (void)fprintf(stderr,"input file %s output file %s swmem %d\n",
+ fprintf(stderr,"input file %s output file %s swmem %d\n",
#endif /* ~SHORTINT */
iname, oname, swmem);
#ifndef KPATHSEA
- (void)fprintf(stderr,"tfm path %s\npk path %s\n", tfmpath, pkpath);
- (void)fprintf(stderr,"fig path %s\nvf path %s\n", figpath, vfpath);
- (void)fprintf(stderr,"config path %s\nheader path %s\n",
+ fprintf(stderr,"tfm path %s\npk path %s\n", tfmpath, pkpath);
+ fprintf(stderr,"fig path %s\nvf path %s\n", figpath, vfpath);
+ fprintf(stderr,"config path %s\nheader path %s\n",
configpath, headerpath);
#endif
#ifdef FONTLIB
- (void)fprintf(stderr,"fli path %s\nfli names %s\n", flipath, fliname);
+ fprintf(stderr,"fli path %s\nfli names %s\n", flipath, fliname);
#endif
} /* dd(D_PATHS) */
#endif /* DEBUG */
@@ -1274,7 +1274,7 @@ default:
error(warningmsg);
headersready = 1;
headerfile = (compressed? CHEADERFILE : HEADERFILE);
- (void)add_header(headerfile);
+ add_header(headerfile);
if (*iname != 0) {
fulliname = nextstring;
#ifndef IGNORE_CWD
@@ -1349,16 +1349,16 @@ default:
}
#endif
if (includesfonts)
- (void)add_header(IFONTHEADER);
+ add_header(IFONTHEADER);
if (usesPSfonts)
- (void)add_header(PSFONTHEADER);
+ add_header(PSFONTHEADER);
if (usesspecial)
- (void)add_header(SPECIALHEADER);
+ add_header(SPECIALHEADER);
if (usescolor) /* IBM: color */
- (void)add_header(COLORHEADER);
+ add_header(COLORHEADER);
#ifdef HPS
if (HPS_FLAG)
- (void)add_header(HPSHEADER);
+ add_header(HPSHEADER);
#endif
sects = sections;
totalpages *= collatedcopies;
@@ -1398,7 +1398,7 @@ default:
fprintf(stderr, "\n");
prettycolumn = 0;
}
- (void)fprintf(stderr, "(-> %s) ", oname);
+ fprintf(stderr, "(-> %s) ", oname);
prettycolumn += strlen(oname) + 6;
}
#ifdef HPS
@@ -1412,10 +1412,10 @@ default:
fprintf(stderr, "\n");
prettycolumn = 0;
}
- (void)fprintf(stderr, ". ");
+ fprintf(stderr, ". ");
prettycolumn += 2;
}
- (void)fflush(stderr);
+ fflush(stderr);
dosection(sects, sectioncopies);
sects = sects->next;
if (sepfiles) {
@@ -1436,7 +1436,7 @@ default:
cleanprinter();
}
if (! quiet)
- (void)fprintf(stderr, "\n");
+ fprintf(stderr, "\n");
#ifdef DEBUG
if (dd(D_MEM)) {
#ifdef SHORTINT
diff --git a/Build/source/texk/dvipsk/emspecial.c b/Build/source/texk/dvipsk/emspecial.c
index 542cd32147e..eba9fdcacd9 100644
--- a/Build/source/texk/dvipsk/emspecial.c
+++ b/Build/source/texk/dvipsk/emspecial.c
@@ -157,7 +157,7 @@ char *emp;
cmdout(emstr);
#ifdef DEBUG
if (dd(D_SPECIAL))
- (void)fprintf(stderr, "em special: Linewidth set to %.1f dots\n",
+ fprintf(stderr, "em special: Linewidth set to %.1f dots\n",
emwidth);
#endif
} else {
@@ -169,9 +169,9 @@ char *emp;
#ifdef DEBUG
if (dd(D_SPECIAL))
#ifdef SHORTINT
- (void)fprintf(stderr, "em special: moveto %ld,%ld\n", hh, vv);
+ fprintf(stderr, "em special: moveto %ld,%ld\n", hh, vv);
#else
- (void)fprintf(stderr, "em special: moveto %d,%d\n", hh, vv);
+ fprintf(stderr, "em special: moveto %d,%d\n", hh, vv);
#endif
#endif
emx = hh;
@@ -181,9 +181,9 @@ char *emp;
#ifdef DEBUG
if (dd(D_SPECIAL))
#ifdef SHORTINT
- (void)fprintf(stderr, "em special: lineto %ld,%ld\n", hh, vv);
+ fprintf(stderr, "em special: lineto %ld,%ld\n", hh, vv);
#else
- (void)fprintf(stderr, "em special: lineto %d,%d\n", hh, vv);
+ fprintf(stderr, "em special: lineto %d,%d\n", hh, vv);
#endif
#endif
cmdout("np");
@@ -210,9 +210,9 @@ char *emp;
#ifdef DEBUG
if (dd(D_SPECIAL))
#ifdef SHORTINT
- (void)fprintf(stderr, "em special: Point %d is %ld,%ld\n",
+ fprintf(stderr, "em special: Point %d is %ld,%ld\n",
#else
- (void)fprintf(stderr, "em special: Point %d is %d,%d\n",
+ fprintf(stderr, "em special: Point %d is %d,%d\n",
#endif
empoint->point, empoint->x, empoint->y);
#endif
@@ -240,14 +240,14 @@ char *emp;
emwidth = emunits(emwidth,emunit);
#ifdef DEBUG
if (dd(D_SPECIAL))
- (void)fprintf(stderr, "em special: Line from point %d to point %d\n",
+ fprintf(stderr, "em special: Line from point %d to point %d\n",
empoint1, empoint2);
#endif
cmdout("np");
if (emwidth!=-1.0) {
#ifdef DEBUG
if (dd(D_SPECIAL))
- (void)fprintf(stderr,"em special: Linewidth temporarily set to %.1f dots\n",
+ fprintf(stderr,"em special: Linewidth temporarily set to %.1f dots\n",
emwidth);
#endif
strcpy(emstr,"currentlinewidth");
@@ -270,7 +270,7 @@ char *emp;
}
}
else if (strncmp(emp, "message", 7) == 0) {
- (void)fprintf(stderr, "em message: %s\n", emp+7);
+ fprintf(stderr, "em message: %s\n", emp+7);
}
else if (strncmp(emp, "graph", 5) == 0) {
int i;
@@ -303,7 +303,7 @@ char *emp;
emgraph(emstr,emwidth,emheight);
}
else {
- (void)fprintf(stderr, "em:graph: no file given\n");
+ fprintf(stderr, "em:graph: no file given\n");
}
}
else {
@@ -668,8 +668,8 @@ imagehead(char *filename, int wide, int high,
fprintf(stderr,"\n");
prettycolumn = 0;
}
- (void)fprintf(stderr,"<%s",name);
- (void)fflush(stderr);
+ fprintf(stderr,"<%s",name);
+ fflush(stderr);
prettycolumn += 2+strlen(name);
if (fullname) free (fullname);
}
@@ -689,10 +689,10 @@ imagehead(char *filename, int wide, int high,
cmdout("scale");
#ifdef DEBUG
if (dd(D_SPECIAL)) {
- (void)fprintf(stderr,
+ fprintf(stderr,
"\nem:graph: %s width %d pixels scaled to %.1f pixels\n",
filename, wide, emwidth);
- (void)fprintf(stderr,
+ fprintf(stderr,
"em:graph: %s height %d pixels scaled to %.1f pixels\n",
filename, high, emheight);
}
@@ -703,13 +703,13 @@ static void
imagetail(void)
{
if (!disablecomments) {
- (void)fprintf(bitfile, "\n%%%%EndDocument\n");
+ fprintf(bitfile, "\n%%%%EndDocument\n");
linepos = 0;
}
nlcmdout("@endspecial");
if (!quiet) {
- (void)fprintf(stderr,">");
- (void)fflush(stderr);
+ fprintf(stderr,">");
+ fflush(stderr);
}
}
@@ -1054,7 +1054,7 @@ rle4read(FILE *f, int w, int b, char *s)
*s++ = fgetc(f);
}
if (ch % 4) /* word align file */
- (void)fgetc(f);
+ fgetc(f);
}
}
else { /* cnt is repeat count */
@@ -1124,7 +1124,7 @@ rle8read(FILE *f, int w, int b, char *s)
*s++ = fgetc(f);
}
if (ch % 2) /* word align file */
- (void)fgetc(f);
+ fgetc(f);
}
}
else { /* cnt is repeat count */
diff --git a/Build/source/texk/dvipsk/finclude.c b/Build/source/texk/dvipsk/finclude.c
index 30b3e12c211..fa2ca6b5dc4 100644
--- a/Build/source/texk/dvipsk/finclude.c
+++ b/Build/source/texk/dvipsk/finclude.c
@@ -253,7 +253,7 @@ scan_fontnames(char *str, const char *psfile)
if (1) {
#ifdef DEBUG
if (dd(D_FONTS))
- (void)fprintf(stderr,
+ fprintf(stderr,
"Adding font '%s' from included postscript file '%s'.\n",
p,psfile);
#endif /* DEBUG */
@@ -384,7 +384,7 @@ scanfontcomments(const char *filename)
#ifdef DEBUG
if (dd(D_FONTS))
- (void)fprintf(stderr,
+ fprintf(stderr,
"Checking for fonts in '%s'\n",filename);
#endif /* DEBUG */
@@ -393,13 +393,13 @@ scanfontcomments(const char *filename)
* Allow scanning of ` commands. Better return same results both times.
*/
f = popen(filename+1, "r");
- (void)SET_BINARY(fileno(f));
+ SET_BINARY(fileno(f));
to_close = USE_PCLOSE;
} else {
f = search(figpath, filename, READ);
}
if (f) {
- (void)SET_BINARY(fileno(f));
+ SET_BINARY(fileno(f));
fc_state = 0;
check_atend = 0;
while (fgets(p,500,f) && p[0]=='%' &&
@@ -418,7 +418,7 @@ scanfontcomments(const char *filename)
if(check_atend) {
#ifdef DEBUG
if (dd(D_FONTS))
- (void)fprintf(stderr,
+ fprintf(stderr,
"Checking for (atend) fonts in '%s'\n",filename);
#endif /* DEBUG */
@@ -439,7 +439,7 @@ scanfontcomments(const char *filename)
#ifdef DEBUG
else { /* r == NULL */
if (dd(D_FONTS))
- (void)fprintf(stderr,
+ fprintf(stderr,
"Did not find %%%%Trailer in included file '%s'.\n",
filename);
}
@@ -474,7 +474,7 @@ nameout(char *area, char *name)
char *s;
if (*area==0 && okascmd(name)) {
- (void)sprintf(buf, "/%s", name);
+ sprintf(buf, "/%s", name);
cmdout(name);
} else {
for (s=area; *s; s++)
diff --git a/Build/source/texk/dvipsk/flib.c b/Build/source/texk/dvipsk/flib.c
index 471cef01f4e..8b3a8d8bf4e 100644
--- a/Build/source/texk/dvipsk/flib.c
+++ b/Build/source/texk/dvipsk/flib.c
@@ -115,7 +115,7 @@ fliload(void)
(void)pkbyte(); /* skip comment */
#ifdef DEBUG
if (dd(D_FONTS))
- (void)fprintf(stderr,"Font library %s has %d font size%s, %d font%s\n",
+ fprintf(stderr,"Font library %s has %d font size%s, %d font%s\n",
name, numsizes , numsizes !=1 ? "s" : "",
numfonts, numfonts!=1 ? "s" : "");
#endif /* DEBUG */
@@ -144,7 +144,7 @@ fliload(void)
#ifdef DEBUG
if (dd(D_FONTS))
- (void)fprintf(stderr,"Font library %s size %.5gdpi has %d font%s\n",
+ fprintf(stderr,"Font library %s size %.5gdpi has %d font%s\n",
name, dpi/65536.0, numfonts, numfonts!=1 ? "s" : "");
#endif /* DEBUG */
size->size = dpi;
@@ -166,7 +166,7 @@ fliload(void)
fli_cache[numflib]->fp = pkfile;
}
else
- (void)fclose(pkfile);
+ fclose(pkfile);
numflib++;
} /* end if opened library */
} /* end if (*name) */
@@ -195,11 +195,11 @@ flisearch(char *n, halfword dpi)
#ifdef DEBUG
if (dd(D_FONTS)) {
- (void)fprintf(stderr,"Trying %s at %ddpi\nfli open:", n, dpi);
+ fprintf(stderr,"Trying %s at %ddpi\nfli open:", n, dpi);
for (i=0; i<FLICSIZE; i++) /* dump cache contents */
if (fli_cache[i]->lib != (struct fli_lib *)NULL)
- (void)fprintf(stderr, " %s",(fli_cache[i]->lib)->name);
- (void)fprintf(stderr,"\n");
+ fprintf(stderr, " %s",(fli_cache[i]->lib)->name);
+ fprintf(stderr,"\n");
}
#endif /* DEBUG */
for (lib = firstlib; lib != (struct fli_lib *)NULL; lib = lib->next ) {
@@ -208,7 +208,7 @@ flisearch(char *n, halfword dpi)
size = lib->size;
#ifdef DEBUG
if (dd(D_FONTS))
- (void)fprintf(stderr," Searching %s\n", lib->name);
+ fprintf(stderr," Searching %s\n", lib->name);
#endif /* DEBUG */
for (; numsizes>0; numsizes--, size++) {
/* for each font size in this library */
@@ -217,7 +217,7 @@ flisearch(char *n, halfword dpi)
/* if correct size then search for font */
#ifdef DEBUG
if (dd(D_FONTS))
- (void)fprintf(stderr, " Checking size %ddpi\n",dpi1);
+ fprintf(stderr, " Checking size %ddpi\n",dpi1);
#endif /* DEBUG */
entry = size->entry;
for (numfonts=size->entries;numfonts > 0; numfonts--, entry++) {
@@ -237,7 +237,7 @@ flisearch(char *n, halfword dpi)
}
if (!found) { /* if not in cache then re-open it */
/* make space at front */
- (void)fclose(fli_cache[FLICSIZE-1]->fp);
+ fclose(fli_cache[FLICSIZE-1]->fp);
centry = fli_cache[FLICSIZE-1];
for (i=FLICSIZE-1; i>0; i--)
fli_cache[i] = fli_cache[i-1];
@@ -253,7 +253,7 @@ flisearch(char *n, halfword dpi)
}
flib = 1; /* tell loadfont() not to close it */
/* then seek font within library */
- (void)sprintf(name,"%s %s %ddpi",lib->name, n, dpi1);
+ sprintf(name,"%s %s %ddpi",lib->name, n, dpi1);
if ( fseek(pkfile,entry->offset,0) )
badpk("couldn't seek font");
/* make sure it is a PK font */
@@ -273,7 +273,7 @@ flisearch(char *n, halfword dpi)
/* if not correct size then skip */
#ifdef DEBUG
if (dd(D_FONTS))
- (void)fprintf(stderr, " Skipping size %ddpi\n", dpi1);
+ fprintf(stderr, " Skipping size %ddpi\n", dpi1);
#endif /* DEBUG */
}
} /* end for numsizes>0 */
diff --git a/Build/source/texk/dvipsk/fontdef.c b/Build/source/texk/dvipsk/fontdef.c
index 0da17216a9e..466c2d4aacf 100644
--- a/Build/source/texk/dvipsk/fontdef.c
+++ b/Build/source/texk/dvipsk/fontdef.c
@@ -65,7 +65,7 @@ newfontdesc(integer cksum, integer scsize, integer dssize,
fp->loadeddpi = fp->dpi;
#ifdef DEBUG
if (dd(D_FONTS))
- (void)fprintf(stderr,"Defining font (%s) %s at %.1fpt\n",
+ fprintf(stderr,"Defining font (%s) %s at %.1fpt\n",
area, name, (real)scsize/(alpha*0x100000));
#endif /* DEBUG */
return fp;
@@ -99,7 +99,7 @@ matchfont(char *name, char *area, integer scsize, char *scname)
}
#ifdef DEBUG
if (dd(D_FONTS) && fp)
- (void)fprintf(stderr,"(Already known.)\n");
+ fprintf(stderr,"(Already known.)\n");
#endif /* DEBUG */
return fp;
}
diff --git a/Build/source/texk/dvipsk/header.c b/Build/source/texk/dvipsk/header.c
index 0f54fd101dc..086616c1ba4 100644
--- a/Build/source/texk/dvipsk/header.c
+++ b/Build/source/texk/dvipsk/header.c
@@ -101,7 +101,7 @@ checkhmem(const char *s, char *pre, char *post)
(*close_file) (f);
#ifdef DEBUG
if (dd(D_HEADER))
- (void)fprintf(stderr, "Adding header file \"%s\" %ld\n",
+ fprintf(stderr, "Adding header file \"%s\" %ld\n",
s, mem);
#endif
fontmem -= mem;
@@ -168,7 +168,7 @@ send_headers(void) {
while (0 != (q=get_name(&p))) {
#ifdef DEBUG
if (dd(D_HEADER))
- (void)fprintf(stderr, "Sending header file \"%s\"\n", q);
+ fprintf(stderr, "Sending header file \"%s\"\n", q);
#endif
#ifdef HPS
if (HPS_FLAG) {
diff --git a/Build/source/texk/dvipsk/hps.c b/Build/source/texk/dvipsk/hps.c
index daf1e23300d..dc20f6a998d 100644
--- a/Build/source/texk/dvipsk/hps.c
+++ b/Build/source/texk/dvipsk/hps.c
@@ -426,17 +426,17 @@ do_target_dict(void)
struct nlist *np;
int i;
(void) fprintf(bitfile, "HPSdict begin\n");
- (void)fprintf(bitfile, "/TargetAnchors\n");
- (void)fprintf(bitfile, "%i dict dup begin\n",count_targets());
+ fprintf(bitfile, "/TargetAnchors\n");
+ fprintf(bitfile, "%i dict dup begin\n",count_targets());
for (i = 0; i < HASHSIZE; i++)
for(np = link_targets[i]; np != NULL; np = np -> next)
- (void)fprintf(bitfile, "(%s) [%i [%.0f %.0f %.0f %.0f] %i] def\n",
+ fprintf(bitfile, "(%s) [%i [%.0f %.0f %.0f %.0f] %i] def\n",
np->defn->title, np->defn->srcpg,
np->defn->rect.llx, np->defn->rect.lly,
np->defn->rect.urx, np->defn->rect.ury,
vert_loc((int) np->defn->rect.lly));
- (void)fprintf(bitfile,"end targetdump-hook def end\n");
+ fprintf(bitfile,"end targetdump-hook def end\n");
}
static int
@@ -474,7 +474,7 @@ stamp_hps(Hps_link *pl)
/* print out the proper pdfm with local page info only
* target info will be in the target dictionary */
- (void)sprintf(tmpbuf,
+ sprintf(tmpbuf,
" (%s) [[%.0f %.0f %.0f %.0f] [%i %i %i [%i %i]] [%.0f %.0f %.0f]] pdfm ",
pl->title, pl->rect.llx, pl->rect.lly, pl->rect.urx, pl->rect.ury,
pl->border[0], pl->border[1], pl->border[2], pl->border[3],pl->border[4],
@@ -506,7 +506,7 @@ stamp_external(char *s, Hps_link *pl)
/* print out the proper pdfm with local page info only
* target info will be in the target dictionary */
- (void)sprintf(tmpbuf," [[%.0f %.0f %.0f %.0f] [%i %i %i [%i %i]] [%.0f %.0f %.0f]] (%s) pdfm ",
+ sprintf(tmpbuf," [[%.0f %.0f %.0f %.0f] [%i %i %i [%i %i]] [%.0f %.0f %.0f]] (%s) pdfm ",
pl->rect.llx, pl->rect.lly, pl->rect.urx, pl->rect.ury,
pl->border[0], pl->border[1], pl->border[2], pl->border[3],pl->border[4],
pl->color[0], pl->color[1], pl->color[2], s);
@@ -520,8 +520,8 @@ finish_hps(void) {
set_bitfile("head.tmp",1);
do_targets();
do_target_dict();
- (void)fprintf(bitfile, "TeXDict begin\n");
- (void)fprintf(bitfile, "%%%%EndSetup\n");
+ fprintf(bitfile, "TeXDict begin\n");
+ fprintf(bitfile, "%%%%EndSetup\n");
fclose(bitfile);
open_output();
noprocset = 1;
diff --git a/Build/source/texk/dvipsk/loadfont.c b/Build/source/texk/dvipsk/loadfont.c
index a769bd73c6e..57810460ecb 100644
--- a/Build/source/texk/dvipsk/loadfont.c
+++ b/Build/source/texk/dvipsk/loadfont.c
@@ -150,7 +150,7 @@ pkopen(register fontdesctype *fd)
{
fd->loadeddpi = dpi_ret;
fd->alreadyscaled = 0;
- (void)sprintf(errbuf,
+ sprintf(errbuf,
"Font %s at %d not found; scaling %d instead.",
n, fd->dpi, dpi_ret);
error(errbuf);
@@ -172,9 +172,9 @@ pkopen(register fontdesctype *fd)
/ (2 * actualdpi);
}
#ifdef MVSXA
- (void)sprintf(name, "pk%d(%s)", fd->dpi + del, n);
+ sprintf(name, "pk%d(%s)", fd->dpi + del, n);
#else
- (void)sprintf(name, "%s.%dpk", n, fd->dpi + del);
+ sprintf(name, "%s.%dpk", n, fd->dpi + del);
#endif
if (0 != (pkfile=pksearch(d, name, READBIN, n, fd->dpi + del, vdpi)))
return(1);
@@ -188,9 +188,9 @@ pkopen(register fontdesctype *fd)
/ (2 * actualdpi);
}
#ifdef MVSXA
- (void)sprintf(name, "pk%d(%s)", fd->dpi, n);
+ sprintf(name, "pk%d(%s)", fd->dpi, n);
#else
- (void)sprintf(name, "%s.%dpk", n, fd->dpi);
+ sprintf(name, "%s.%dpk", n, fd->dpi);
#endif
makefont(n, (int)fd->dpi, DPI);
if (dontmakefont == 0 &&
@@ -230,9 +230,9 @@ pkopen(register fontdesctype *fd)
/ (2 * actualdpi);
}
#ifdef MVSXA
- (void)sprintf(name, "pk%d(%s)", lastresortsizes[j], n);
+ sprintf(name, "pk%d(%s)", lastresortsizes[j], n);
#else
- (void)sprintf(name, "%s.%dpk", n, lastresortsizes[j]);
+ sprintf(name, "%s.%dpk", n, lastresortsizes[j]);
#endif
#ifdef FONTLIB
if (0 != (pkfile=flisearch(n,(halfword)lastresortsizes[j]))
@@ -244,7 +244,7 @@ pkopen(register fontdesctype *fd)
#endif
fd->loadeddpi = lastresortsizes[j];
fd->alreadyscaled = 0;
- (void)sprintf(errbuf,
+ sprintf(errbuf,
"Font %s at %d dpi not found; scaling %d instead.",
n, fd->dpi, lastresortsizes[j]);
error(errbuf);
@@ -259,7 +259,7 @@ pkopen(register fontdesctype *fd)
vdpi = (2 * ((long)vactualdpi) * lastresortsizes[j] + actualdpi)
/ (2 * actualdpi);
}
- (void)sprintf(name, "%s.%dpk", n, lastresortsizes[j]);
+ sprintf(name, "%s.%dpk", n, lastresortsizes[j]);
#ifdef FONTLIB
if (0 != (pkfile=flisearch(n, (halfword)lastresortsizes[j]))
|| 0 != (pkfile=pksearch(d, name, READBIN, n,
@@ -270,7 +270,7 @@ pkopen(register fontdesctype *fd)
#endif
fd->loadeddpi = lastresortsizes[j];
fd->alreadyscaled = 0;
- (void)sprintf(errbuf,
+ sprintf(errbuf,
"Font %s at %d dpi not found; scaling %d instead.",
name, fd->dpi, lastresortsizes[j]);
error(errbuf);
@@ -281,11 +281,11 @@ pkopen(register fontdesctype *fd)
}
}
#ifdef MVSXA
- (void)sprintf(name, "%s.pk%d", n, fd->dpi);
+ sprintf(name, "%s.pk%d", n, fd->dpi);
#else
- (void)sprintf(name, "%s.%dpk", n, fd->dpi);
+ sprintf(name, "%s.%dpk", n, fd->dpi);
#endif
- (void)sprintf(errbuf,
+ sprintf(errbuf,
"Font %s%s not found, characters will be left blank.",
fd->area, name);
error(errbuf);
@@ -343,12 +343,12 @@ loadfont(register fontdesctype *curfnt)
fprintf(stderr, "\n");
prettycolumn = 0;
}
- (void)fprintf(stderr, "<%s>", realnameoffile);
+ fprintf(stderr, "<%s>", realnameoffile);
prettycolumn += strlen(realnameoffile) + 2;
}
#ifdef DEBUG
if (dd(D_FONTS))
- (void)fprintf(stderr,"Loading pk font %s at %.1fpt\n",
+ fprintf(stderr,"Loading pk font %s at %.1fpt\n",
curfnt->name, (real)scaledsize/(alpha*0x100000));
#endif /* DEBUG */
if (pkbyte()!=247)
@@ -429,7 +429,7 @@ case 7:
if (bytesleft < length || (length > MINCHUNK && compressed)) {
#ifdef DEBUG
if (dd(D_MEM))
- (void)fprintf(stderr,
+ fprintf(stderr,
#ifdef SHORTINT
"Allocating new raster memory (%ld req, %ld left)\n",
length, bytesleft);
@@ -488,7 +488,7 @@ default:
flib = 0;
else
#endif
- (void)fclose(pkfile);
+ fclose(pkfile);
curfnt->loaded = 1;
curfnt->maxchars = maxcc + 1;
if (munged > 0) {
diff --git a/Build/source/texk/dvipsk/makefont.c b/Build/source/texk/dvipsk/makefont.c
index 80c9b816baa..84d90cae13f 100644
--- a/Build/source/texk/dvipsk/makefont.c
+++ b/Build/source/texk/dvipsk/makefont.c
@@ -67,7 +67,7 @@ mfjobout(char *font, double mag)
fprintf(mfjobfile,"output=pk[%s];\n",pkout);
}
fprintf(mfjobfile,"{font=%s; mag=%f;}\n",font,mag);
- (void)fprintf(stderr,
+ fprintf(stderr,
"Appending {font=%s; mag=%f;} to %s\n",font,mag,mfjobname);
}
#endif
@@ -152,16 +152,16 @@ makefont(char *name, int dpi, int bdpi)
else {
switch (*++p) {
case 'n' : case 'N' :
- (void)strcpy(q, name);
+ strcpy(q, name);
break;
case 'd' : case 'D' :
- (void)sprintf(q, "%d", dpi);
+ sprintf(q, "%d", dpi);
break;
case 'b' : case 'B' :
- (void)sprintf(q, "%d", bdpi);
+ sprintf(q, "%d", bdpi);
break;
case 'o' : case 'O' :
- (void)sprintf(q, "%s", mfmode ? mfmode : "default");
+ sprintf(q, "%s", mfmode ? mfmode : "default");
modegiven = 1;
break;
case 'm' : case 'M' :
@@ -219,18 +219,18 @@ case 'm' : case 'M' :
if (m < 0)
t = 1 / t;
}
- (void)sprintf(q, "%12.9f", t);
+ sprintf(q, "%12.9f", t);
#else
#ifndef ATARIST
if (m == 9999) {
#else
{
#endif
- (void)sprintf(q, "%d+%d/%d", dpi/bdpi, dpi%bdpi, bdpi);
+ sprintf(q, "%d+%d/%d", dpi/bdpi, dpi%bdpi, bdpi);
} else if (m >= 0) {
- (void)sprintf(q, "magstep\\(%d.%d\\)", m/2, (m&1)*5);
+ sprintf(q, "magstep\\(%d.%d\\)", m/2, (m&1)*5);
} else {
- (void)sprintf(q, "magstep\\(-%d.%d\\)", (-m)/2, (m&1)*5);
+ sprintf(q, "magstep\\(-%d.%d\\)", (-m)/2, (m&1)*5);
}
#endif
break;
@@ -249,14 +249,14 @@ default: *q++ = *p;
}
#ifdef OS2
if ((_osmode == OS2_MODE) && filter)
- (void)strcat(buf, quiet ? " >nul" : " 1>&2");
+ strcat(buf, quiet ? " >nul" : " 1>&2");
#else
#ifndef VMCMS /* no filters and no need to print to stderr */
#ifndef MVSXA
#ifndef MSDOS
#ifndef ATARIST
if (filter)
- (void)strcat(buf, quiet ? " >/dev/null" : " 1>&2");
+ strcat(buf, quiet ? " >/dev/null" : " 1>&2");
#endif
#endif
#endif
@@ -265,18 +265,18 @@ default: *q++ = *p;
#if defined MSDOS || defined OS2
if (! quiet && mfjobname == (char *)NULL)
- (void)fprintf(stderr, "- %s\n", buf);
+ fprintf(stderr, "- %s\n", buf);
if (dontmakefont == 0) {
if (mfjobname != (char *)NULL)
mfjobout(name,t);
else
- (void)system(buf);
+ system(buf);
}
#else
if (! quiet)
- (void)fprintf(stderr, "- %s\n", buf);
+ fprintf(stderr, "- %s\n", buf);
if (dontmakefont == 0)
- (void)system(buf);
+ system(buf);
#endif
else {
static FILE *fontlog = 0;
@@ -284,7 +284,7 @@ default: *q++ = *p;
if (fontlog == 0) {
fontlog = fopen("missfont.log", "a");
if (fontlog != 0) {
- (void)fprintf(stderr,
+ fprintf(stderr,
#ifndef VMCMS
"Appending font creation commands to missfont.log\n");
#else
@@ -293,8 +293,8 @@ default: *q++ = *p;
}
}
if (fontlog != 0) {
- (void)fprintf(fontlog, "%s\n", buf);
- (void)fflush(fontlog);
+ fprintf(fontlog, "%s\n", buf);
+ fflush(fontlog);
}
}
}
diff --git a/Build/source/texk/dvipsk/output.c b/Build/source/texk/dvipsk/output.c
index 57a98979c1c..c3aa22a435f 100644
--- a/Build/source/texk/dvipsk/output.c
+++ b/Build/source/texk/dvipsk/output.c
@@ -125,14 +125,14 @@ copyfile_general(const char *s, struct header_list *cur_header)
lastdirsep = strrchr(s, '/');
if ( NULL != lastdirsep ) trunc_s = lastdirsep + 1;
#ifdef VMCMS
- (void)sprintf(errbuf,
+ sprintf(errbuf,
"Couldn't find figure file %s with CMS name %s; continuing.\nNote that an absolute path or a relative path with .. are denied in -R2 mode.", s, trunc_s);
#else /* VMCMS */
- (void)sprintf(errbuf,
+ sprintf(errbuf,
"Couldn't find figure file %s with MVS name %s; continuing.\nNote that an absolute path or a relative path with .. are denied in -R2 mode.", s, trunc_s);
#endif /* VMCMS */
#else /* VMCMS || MVSXA */
- (void)sprintf(errbuf, "Could not find figure file %s; continuing.\nNote that an absolute path or a relative path with .. are denied in -R2 mode.", s);
+ sprintf(errbuf, "Could not find figure file %s; continuing.\nNote that an absolute path or a relative path with .. are denied in -R2 mode.", s);
#endif /* VMCMS || MVSXA */
break;
#ifndef VMCMS
@@ -143,19 +143,19 @@ copyfile_general(const char *s, struct header_list *cur_header)
#ifndef __THINK__
case 2:
#ifdef SECURE
- (void)sprintf(errbuf, "<%s>: Tick filename execution disabled", s);
+ sprintf(errbuf, "<%s>: Tick filename execution disabled", s);
#else
#ifdef OS2
if (_osmode == OS2_MODE) {
#endif
if (secure == 0) {
- (void)sprintf(errbuf, "Execution of <%s> failed ", s);
+ sprintf(errbuf, "Execution of <%s> failed ", s);
f = popen(s, "r");
if (f != 0)
- (void)SET_BINARY(fileno(f));
+ SET_BINARY(fileno(f));
}
else {
- (void)sprintf(errbuf,"Secure mode is %d so execute <%s> will not run", secure,s);
+ sprintf(errbuf,"Secure mode is %d so execute <%s> will not run", secure,s);
}
#ifdef OS2
}
@@ -174,7 +174,7 @@ copyfile_general(const char *s, struct header_list *cur_header)
if(f==NULL)
f = search(figpath, s, READBIN);
}
- (void)sprintf(errbuf, "! Could not find header file %s.\nNote that an absolute path or a relative path with .. are denied in -R2 mode.", s);
+ sprintf(errbuf, "! Could not find header file %s.\nNote that an absolute path or a relative path with .. are denied in -R2 mode.", s);
break;
}
if (f==NULL)
@@ -190,11 +190,11 @@ copyfile_general(const char *s, struct header_list *cur_header)
prettycolumn = 0;
}
#if defined(VMCMS) || defined (MVSXA)
- (void)fprintf(stderr, "<%s>", trunc_s);
+ fprintf(stderr, "<%s>", trunc_s);
#else
- (void)fprintf(stderr, "<%s>", realnameoffile);
+ fprintf(stderr, "<%s>", realnameoffile);
#endif
- (void)fflush(stderr);
+ fflush(stderr);
#if defined(VMCMS) || defined (MVSXA)
prettycolumn += 2 + strlen(s);
#else
@@ -202,7 +202,7 @@ copyfile_general(const char *s, struct header_list *cur_header)
#endif
}
if (linepos != 0)
- (void)putc('\n', bitfile);
+ putc('\n', bitfile);
/*
* Suggested by Andrew Trevorrow; don't ever BeginFont a file ending in .enc
*/
@@ -210,17 +210,17 @@ copyfile_general(const char *s, struct header_list *cur_header)
infont = 0;
if (! disablecomments) {
if (infigure)
- (void)fprintf(bitfile, "%%%%BeginDocument: %s\n", s);
+ fprintf(bitfile, "%%%%BeginDocument: %s\n", s);
else if (infont)
- (void)fprintf(bitfile, "%%%%BeginFont: %s\n", infont);
+ fprintf(bitfile, "%%%%BeginFont: %s\n", infont);
#ifdef HPS
else if (noprocset) {}
#endif
else
- (void)fprintf(bitfile, "%%%%BeginProcSet: %s 0 0\n", s);
+ fprintf(bitfile, "%%%%BeginProcSet: %s 0 0\n", s);
}
if (cur_header && cur_header->precode) {
- (void)fprintf(bitfile, "%s\n", cur_header->precode);
+ fprintf(bitfile, "%s\n", cur_header->precode);
free(cur_header->precode);
}
c = getc(f);
@@ -242,14 +242,14 @@ case 2:
len = 0;
} else {
if (c == '\r') { /* Mac- or DOS-style text file */
- (void)putc('\n', bitfile);
+ putc('\n', bitfile);
if ((c = getc(f)) == '\n') /* DOS-style text */
len--; /* consume, but don't generate NL */
else
ungetc(c, f);
}
else
- (void)putc(c, bitfile);
+ putc(c, bitfile);
len--;
}
}
@@ -262,8 +262,8 @@ case 2:
error("premature EOF in MS-DOS font file");
len = 0;
} else {
- (void)putc(hxdata[c >> 4], bitfile);
- (void)putc(hxdata[c & 15], bitfile);
+ putc(hxdata[c >> 4], bitfile);
+ putc(hxdata[c & 15], bitfile);
len--;
prevc += 2;
if (prevc >= 76) {
@@ -327,8 +327,8 @@ msdosdone:
*dscLinePointer = 0;
*dscLineEnd = 0;
if (scanForEnd == 0 && removecomments) {
- (void)fputs(possibleDSCLine, bitfile);
- (void)putc('\n', bitfile);
+ fputs(possibleDSCLine, bitfile);
+ putc('\n', bitfile);
}
if (strncmp(possibleDSCLine, "%%BeginFont:", 12) == 0) {
@@ -380,11 +380,11 @@ msdosdone:
p++;
while (*p && *p <= ' ')
p++;
- (void)putc(c, bitfile);
+ putc(c, bitfile);
if (c == '\r') { /* maybe we have a DOS-style text file */
c = getc(f);
if (c == '\n') {
- (void)putc(c, bitfile);
+ putc(c, bitfile);
dosepsend--;
} else
ungetc(c, f);
@@ -405,7 +405,7 @@ msdosdone:
if (c == EOF)
error(
"! premature end of file in binary section");
- (void)putc(c, bitfile);
+ putc(c, bitfile);
}
} else {
/*
@@ -419,7 +419,7 @@ msdosdone:
if (c == EOF)
error(
"! premature end of file in binary section");
- (void)putc(c, bitfile);
+ putc(c, bitfile);
if (c == '\n')
newlines++;
else if (c == '\r')
@@ -441,7 +441,7 @@ msdosdone:
c = getc(f);
dosepsend--;
if (c == '\n' || c == '\r') {
- (void)putc(c, bitfile);
+ putc(c, bitfile);
if (c == '\r') { /* DOS-style text file? */
c = getc(f);
dosepsend--;
@@ -467,7 +467,7 @@ msdosdone:
error(
" expected to see %%EndBinary at end of data; struggling on");
while (1) {
- (void)putc(c, bitfile);
+ putc(c, bitfile);
if (c == '\r' || c == '\n') {
if (c == '\r') { /* DOS-style text file? */
c = getc(f);
@@ -506,14 +506,14 @@ msdosdone:
}
}
while (1) {
- (void)putc(c, bitfile);
+ putc(c, bitfile);
if (c == '\r' || c == '\n') {
if (c == '\r') { /* DOS-style text file? */
c = getc(f);
if (c != '\n')
ungetc(c, f);
else {
- (void)putc(c, bitfile);
+ putc(c, bitfile);
dosepsend--;
}
}
@@ -554,7 +554,7 @@ msdosdone:
if (c != 4 || scanningFont) {
#endif
if (!removingBytes)
- (void)putc(c, bitfile);
+ putc(c, bitfile);
}
prevc = c;
/* begin DOS EPS code */
@@ -568,7 +568,7 @@ msdosdone:
else if (c == '\r' && ! scanningFont) {
c = getc(f);
if (c == '\n') { /* DOS-style text file? */
- if (!removingBytes) (void)putc('\r', bitfile);
+ if (!removingBytes) putc('\r', bitfile);
dosepsend--;
} else
ungetc(c, f);
@@ -580,7 +580,7 @@ msdosdone:
}
}
if (prevc != '\n')
- (void)putc('\n', bitfile);
+ putc('\n', bitfile);
linepos = 0;
#ifndef VMCMS
#ifndef MVSXA
@@ -592,10 +592,10 @@ msdosdone:
#ifdef OS2
{
if (_osmode == OS2_MODE)
- (void)pclose(f);
+ pclose(f);
}
#else
- (void)pclose(f);
+ pclose(f);
#endif
else
#endif
@@ -604,21 +604,21 @@ msdosdone:
#endif
#endif
#endif
- (void)fclose(f);
+ fclose(f);
if (cur_header && cur_header->postcode) {
- (void)fprintf(bitfile, "\n%s", cur_header->postcode);
+ fprintf(bitfile, "\n%s", cur_header->postcode);
free(cur_header->postcode);
}
if (!disablecomments) {
if (infigure)
- (void)fprintf(bitfile, "\n%%%%EndDocument\n");
+ fprintf(bitfile, "\n%%%%EndDocument\n");
else if (infont)
- (void)fprintf(bitfile, "\n%%%%EndFont\n");
+ fprintf(bitfile, "\n%%%%EndFont\n");
#ifdef HPS
else if (noprocset) {}
#endif
else
- (void)fprintf(bitfile, "\n%%%%EndProcSet\n");
+ fprintf(bitfile, "\n%%%%EndProcSet\n");
}
}
}
@@ -649,10 +649,10 @@ void
specialout(char c)
{
if (linepos >= LINELENGTH) {
- (void)putc('\n', bitfile);
+ putc('\n', bitfile);
linepos = 0;
}
- (void)putc(c, bitfile);
+ putc(c, bitfile);
linepos++;
lastspecial = 1;
}
@@ -661,13 +661,13 @@ void
stringend(void)
{
if (linepos + instring >= LINELENGTH - 2) {
- (void)putc('\n', bitfile);
+ putc('\n', bitfile);
linepos = 0;
}
- (void)putc('(', bitfile);
+ putc('(', bitfile);
*strbp = 0;
- (void)fputs(strbuffer, bitfile);
- (void)putc(')', bitfile);
+ fputs(strbuffer, bitfile);
+ putc(')', bitfile);
linepos += instring + 2;
lastspecial = 1;
instring = 0;
@@ -802,13 +802,13 @@ cmdout(const char *s)
l = strlen(s);
if ((! lastspecial && linepos >= LINELENGTH - 20) ||
linepos + l >= LINELENGTH) {
- (void)putc('\n', bitfile);
+ putc('\n', bitfile);
linepos = 0;
} else if (! lastspecial) {
- (void)putc(' ', bitfile);
+ putc(' ', bitfile);
linepos++;
}
- (void)fputs(s, bitfile);
+ fputs(s, bitfile);
linepos += l;
lastspecial = 0;
}
@@ -819,13 +819,13 @@ chrcmd(char c)
{
if ((! lastspecial && linepos >= LINELENGTH - 20) ||
linepos + 2 > LINELENGTH) {
- (void)putc('\n', bitfile);
+ putc('\n', bitfile);
linepos = 0;
} else if (! lastspecial) {
- (void)putc(' ', bitfile);
+ putc(' ', bitfile);
linepos++;
}
- (void)putc(c, bitfile);
+ putc(c, bitfile);
linepos++;
lastspecial = 0;
}
@@ -835,7 +835,7 @@ floatout(float n)
{
char buf[20];
- (void)sprintf(buf, "%.2f", n);
+ sprintf(buf, "%.2f", n);
cmdout(buf);
}
@@ -844,7 +844,7 @@ doubleout(double n)
{
char buf[40];
- (void)sprintf(buf, "%g", n);
+ sprintf(buf, "%g", n);
cmdout(buf);
}
@@ -854,9 +854,9 @@ numout(integer n)
char buf[10];
#ifdef SHORTINT
- (void)sprintf(buf, "%ld", n);
+ sprintf(buf, "%ld", n);
#else
- (void)sprintf(buf, "%d", n);
+ sprintf(buf, "%d", n);
#endif
cmdout(buf);
}
@@ -870,7 +870,7 @@ mhexout(register unsigned char *p,
while (len > 0) {
if (linepos > LINELENGTH - 2) {
- (void)putc('\n', bitfile);
+ putc('\n', bitfile);
linepos = 0;
}
k = (LINELENGTH - linepos) >> 1;
@@ -880,8 +880,8 @@ mhexout(register unsigned char *p,
linepos += (k << 1);
while (k--) {
n = *p++;
- (void)putc(hexchar[n >> 4], bitfile);
- (void)putc(hexchar[n & 15], bitfile);
+ putc(hexchar[n >> 4], bitfile);
+ putc(hexchar[n & 15], bitfile);
}
}
}
@@ -1001,7 +1001,7 @@ void
newline(void)
{
if (linepos != 0) {
- (void)fprintf(bitfile, "\n");
+ fprintf(bitfile, "\n");
linepos = 0;
}
lastspecial = 1;
@@ -1246,7 +1246,7 @@ paperspec(const char *s, int hed)
sendit = ! hed;
if (sendit) {
while (*s && *s != '\n')
- (void)putc(*s++, bitfile);
+ putc(*s++, bitfile);
putc('\n', bitfile);
} else {
while (*s && *s != '\n')
@@ -1310,7 +1310,7 @@ open_output(void) {
#endif
if (pf == NULL && (pf = popen(oname+1, "w")) != NULL) {
popened = 1;
- (void)SET_BINARY(fileno(pf));
+ SET_BINARY(fileno(pf));
}
if (pf == NULL)
error("! couldn't open output pipe");
@@ -1322,7 +1322,7 @@ open_output(void) {
} else {
if ((bitfile=fopen(oname,"w"))==NULL)
error("! couldn't open PostScript file");
- (void)SET_BINARY(fileno(bitfile));
+ SET_BINARY(fileno(bitfile));
}
} else {
bitfile = stdout;
@@ -1344,29 +1344,29 @@ initprinter(sectiontype *sect)
findpapersize();
if (disablecomments) {
- (void)fprintf(bitfile,
+ fprintf(bitfile,
"%%!PS (but not EPSF; comments have been disabled)\n");
- (void)fprintf(stderr, "Warning: no %%%%Page comments generated.\n");
+ fprintf(stderr, "Warning: no %%%%Page comments generated.\n");
} else {
if (multiplesects) {
- (void)fprintf(bitfile,
+ fprintf(bitfile,
"%%!PS (but not EPSF because of memory limits)\n");
- (void)fprintf(stderr, "Warning: no %%%%Page comments generated.\n");
+ fprintf(stderr, "Warning: no %%%%Page comments generated.\n");
} else {
isepsf = epsftest(sect->bos);
if (isepsf)
- (void)fprintf(bitfile, "%%!PS-Adobe-2.0 EPSF-2.0\n");
+ fprintf(bitfile, "%%!PS-Adobe-2.0 EPSF-2.0\n");
else
- (void)fprintf(bitfile, "%%!PS-Adobe-2.0\n");
+ fprintf(bitfile, "%%!PS-Adobe-2.0\n");
}
if (tryepsf && isepsf == 0)
error("We tried, but couldn't make it EPSF.");
- (void)fprintf(bitfile, "%%%%Creator: %s\n", banner + 8);
+ fprintf(bitfile, "%%%%Creator: %s\n", banner + 8);
if (*iname)
- (void)fprintf(bitfile, "%%%%Title: %s\n", iname);
+ fprintf(bitfile, "%%%%Title: %s\n", iname);
#ifdef CREATIONDATE
jobtime=time(0);
- (void)fprintf(bitfile, "%%%%CreationDate: %s",
+ fprintf(bitfile, "%%%%CreationDate: %s",
asctime(localtime(&jobtime)));
#endif
if (! isepsf) {
@@ -1376,9 +1376,9 @@ initprinter(sectiontype *sect)
* 644 of the Red book. But we have to, for many existing
* spoolers.
*/
- (void)fprintf(bitfile, "%%%%Pages: %d%s\n", (sepfiles ? n : totalpages),
+ fprintf(bitfile, "%%%%Pages: %d%s\n", (sepfiles ? n : totalpages),
(reverse?" -1":""));
- (void)fprintf(bitfile, "%%%%PageOrder: %sscend\n", reverse?"De":"A");
+ fprintf(bitfile, "%%%%PageOrder: %sscend\n", reverse?"De":"A");
}
if (landscape) {
fprintf(bitfile, "%%%%Orientation: Landscape\n");
@@ -1391,7 +1391,7 @@ initprinter(sectiontype *sect)
topoints(finpapsiz->xsize), topoints(finpapsiz->ysize));
tell_needed_fonts();
paperspec(finpapsiz->specdat, 1);
- (void)fprintf(bitfile, "%%%%EndComments\n");
+ fprintf(bitfile, "%%%%EndComments\n");
}
{
int i, len;
@@ -1401,8 +1401,8 @@ initprinter(sectiontype *sect)
* Here, too, we have to be careful not to exceed the line length
* limitation, if possible.
*/
- (void)fprintf(bitfile, "%%DVIPSWebPage: %s\n", banner2);
- (void)fprintf(bitfile, "%%DVIPSCommandLine:");
+ fprintf(bitfile, "%%DVIPSWebPage: %s\n", banner2);
+ fprintf(bitfile, "%%DVIPSCommandLine:");
len = 18;
for (i=0; i<gargc; i++) {
p = gargv[i];
@@ -1412,21 +1412,21 @@ initprinter(sectiontype *sect)
len += 2;
len += strlen(gargv[i]) + 1;
if (len > LINELENGTH) {
- (void)fprintf(bitfile, "\n%%+");
+ fprintf(bitfile, "\n%%+");
len = strlen(gargv[i]) + 3;
if (*p)
len += 2;
}
- (void)fprintf(bitfile, (*p ? " \"%s\"" : " %s"), gargv[i]);
+ fprintf(bitfile, (*p ? " \"%s\"" : " %s"), gargv[i]);
}
- (void)fprintf(bitfile, "\n%%DVIPSParameters: dpi=%d", actualdpi);
+ fprintf(bitfile, "\n%%DVIPSParameters: dpi=%d", actualdpi);
if (actualdpi != vactualdpi)
- (void)fprintf(bitfile, "x%d", vactualdpi);
+ fprintf(bitfile, "x%d", vactualdpi);
if (compressed)
- (void)fprintf(bitfile, ", compressed");
+ fprintf(bitfile, ", compressed");
if (removecomments)
- (void)fprintf(bitfile, ", comments removed");
- (void)fputc('\n', bitfile);
+ fprintf(bitfile, ", comments removed");
+ fputc('\n', bitfile);
}
#if defined(VMCMS) || defined (MVSXA) /* convert preamblecomment to ebcdic so we can read it */
{
@@ -1435,11 +1435,11 @@ initprinter(sectiontype *sect)
preamblecomment[i] = ascii2ebcdic[preamblecomment[i]];
}
#endif
- (void)fprintf(bitfile, "%%DVIPSSource: %s\n", preamblecomment);
+ fprintf(bitfile, "%%DVIPSSource: %s\n", preamblecomment);
linepos = 0;
endprologsent = 0;
if (safetyenclose)
- (void)fprintf(bitfile, "/SafetyEnclosure save def\n");
+ fprintf(bitfile, "/SafetyEnclosure save def\n");
print_composefont();
if (! headers_off)
send_headers();
@@ -1448,33 +1448,33 @@ void
setup(void) {
newline();
if (endprologsent == 0 && !disablecomments) {
- (void)fprintf(bitfile, "%%%%EndProlog\n");
- (void)fprintf(bitfile, "%%%%BeginSetup\n");
+ fprintf(bitfile, "%%%%EndProlog\n");
+ fprintf(bitfile, "%%%%BeginSetup\n");
if (vactualdpi == actualdpi)
- (void)fprintf(bitfile, "%%%%Feature: *Resolution %ddpi\n",
+ fprintf(bitfile, "%%%%Feature: *Resolution %ddpi\n",
actualdpi);
else
- (void)fprintf(bitfile, "%%%%Feature: *Resolution %dx%ddpi\n",
+ fprintf(bitfile, "%%%%Feature: *Resolution %dx%ddpi\n",
actualdpi, vactualdpi);
if (multiplesects && *(finpapsiz->specdat)) {
- (void)fprintf(bitfile, "TeXDict begin\n");
+ fprintf(bitfile, "TeXDict begin\n");
paperspec(finpapsiz->specdat, 0);
- (void)fprintf(bitfile, "end\n");
+ fprintf(bitfile, "end\n");
}
if (manualfeed)
- (void)fprintf(bitfile, "%%%%Feature: *ManualFeed True\n");
+ fprintf(bitfile, "%%%%Feature: *ManualFeed True\n");
#ifdef HPS
if (!HPS_FLAG)
#endif
if (multiplesects)
- (void)fprintf(bitfile, "%%%%EndSetup\n");
+ fprintf(bitfile, "%%%%EndSetup\n");
}
if (multiplesects && ! disablecomments)
- (void)fprintf(bitfile, "%%DVIPSBeginSection\n");
+ fprintf(bitfile, "%%DVIPSBeginSection\n");
cmdout("TeXDict");
cmdout("begin");
if (endprologsent || disablecomments || multiplesects == 0) {
- (void)fprintf(bitfile, "\n");
+ fprintf(bitfile, "\n");
paperspec(finpapsiz->specdat, 0);
}
if (manualfeed) cmdout("@manualfeed");
@@ -1491,7 +1491,7 @@ setup(void) {
if (!HPS_FLAG)
#endif
if (! multiplesects)
- (void)fprintf(bitfile, "%%%%EndSetup\n");
+ fprintf(bitfile, "%%%%EndSetup\n");
}
#ifdef HPS
if (HPS_FLAG) {
@@ -1506,14 +1506,14 @@ setup(void) {
void
cleanprinter(void)
{
- (void)fprintf(bitfile, "\n");
- (void)fprintf(bitfile, "userdict /end-hook known{end-hook}if\n");
+ fprintf(bitfile, "\n");
+ fprintf(bitfile, "userdict /end-hook known{end-hook}if\n");
if (safetyenclose)
- (void)fprintf(bitfile, "SafetyEnclosure restore\n");
+ fprintf(bitfile, "SafetyEnclosure restore\n");
if (!disablecomments)
- (void)fprintf(bitfile, "%%%%EOF\n");
+ fprintf(bitfile, "%%%%EOF\n");
if (sendcontrolD)
- (void)putc(4, bitfile);
+ putc(4, bitfile);
if (ferror(bitfile))
error("Problems with file writing; probably disk full.");
#if !defined(MSDOS) || defined(__DJGPP__)
@@ -1526,7 +1526,7 @@ cleanprinter(void)
if (_osmode == OS2_MODE)
#endif
if (popened)
- (void)pclose(bitfile);
+ pclose(bitfile);
#endif
#endif
#endif
@@ -1534,7 +1534,7 @@ cleanprinter(void)
#endif
#endif
if (popened == 0)
- (void)fclose(bitfile);
+ fclose(bitfile);
bitfile = NULL;
}
@@ -1558,13 +1558,13 @@ pageinit(void)
if (!disablecomments) {
if (multiplesects)
#ifdef SHORTINT
- (void)fprintf(bitfile, "%%DVIPSSectionPage: %ld\n", pagenum);
+ fprintf(bitfile, "%%DVIPSSectionPage: %ld\n", pagenum);
else if (! isepsf)
- (void)fprintf(bitfile, "%%%%Page: %ld %d\n", pagenum, thispage);
+ fprintf(bitfile, "%%%%Page: %ld %d\n", pagenum, thispage);
#else
- (void)fprintf(bitfile, "%%DVIPSSectionPage: %d\n", pagenum);
+ fprintf(bitfile, "%%DVIPSSectionPage: %d\n", pagenum);
else if (! isepsf)
- (void)fprintf(bitfile, "%%%%Page: %d %d\n", pagenum, thispage);
+ fprintf(bitfile, "%%%%Page: %d %d\n", pagenum, thispage);
#endif
}
linepos = 0;
diff --git a/Build/source/texk/dvipsk/pprescan.c b/Build/source/texk/dvipsk/pprescan.c
index f42af47abe5..1413f627fde 100644
--- a/Build/source/texk/dvipsk/pprescan.c
+++ b/Build/source/texk/dvipsk/pprescan.c
@@ -47,9 +47,9 @@ pscanpage(void)
#ifdef DEBUG
if (dd(D_PAGE))
#ifdef SHORTINT
- (void)fprintf(stderr,"PPrescanning page %ld\n", pagenum);
+ fprintf(stderr,"PPrescanning page %ld\n", pagenum);
#else /* ~SHORTINT */
- (void)fprintf(stderr,"PPrescanning page %d\n", pagenum);
+ fprintf(stderr,"PPrescanning page %d\n", pagenum);
#endif /* ~SHORTINT */
#endif /* DEBUG */
curfnt = NULL;
@@ -66,7 +66,7 @@ case 255: /* pTeX's dir or undefined */
case 131: case 136: case 139: /* set4, put4, bop */
case 247: case 248: case 249: /* pre, post, post_post */
case 250: case 251: case 252: case 253: case 254: /* undefined */
- (void)sprintf(errbuf,
+ sprintf(errbuf,
"! DVI file contains unexpected command (%d)",cmd);
error(errbuf);
case 132: case 137: /* eight-byte commands setrule, putrule */
@@ -91,7 +91,7 @@ case 138: case 141: case 142: /* nop, push, pop */
break;
case 130: case 135: /* set3, put3 */
if (noptex) {
- (void)sprintf(errbuf,
+ sprintf(errbuf,
"! DVI file contains unexpected pTeX command (%d)",cmd);
error(errbuf);
}
@@ -100,7 +100,7 @@ case 130: case 135: /* set3, put3 */
goto dochar;
case 129: case 134: /* set2, put2 */
if (noomega) {
- (void)sprintf(errbuf,
+ sprintf(errbuf,
"! DVI file contains unexpected Omega command (%d)",cmd);
error(errbuf);
}
@@ -113,7 +113,7 @@ dochar:
if (curfnt==NULL)
error("! Bad DVI file: no font selected");
if (mychar>=curfnt->maxchars) {
- (void)sprintf(errbuf,"! invalid char %d from font %s", mychar, curfnt->name);
+ sprintf(errbuf,"! invalid char %d from font %s", mychar, curfnt->name);
error(errbuf);
}
if (curfnt->loaded == 2) { /* scanning a virtual font character */
diff --git a/Build/source/texk/dvipsk/prescan.c b/Build/source/texk/dvipsk/prescan.c
index e81e7299969..3dd2b20b9e6 100644
--- a/Build/source/texk/dvipsk/prescan.c
+++ b/Build/source/texk/dvipsk/prescan.c
@@ -21,7 +21,7 @@ readpreamble(void)
if (dvibyte()!=2) error("! Bad DVI file: id byte not 2");
num = signedquad();
den = signedquad();
- if (overridemag > 0) (void)signedquad();
+ if (overridemag > 0) signedquad();
else if (overridemag < 0) mag = (mag * signedquad()) / 1000.0;
else mag = signedquad();
conv = (real) num * DPI * mag / ( den * 254000000.0 );
@@ -32,17 +32,17 @@ readpreamble(void)
for (i=dvibyte(),p=preamblecomment;i>0;i--,p++) *p=dvibyte();
*p='\0';
if (!quiet) {
- (void)fprintf(stderr, "'");
+ fprintf(stderr, "'");
#ifdef VMCMS /* IBM: VM/CMS */
- for(p=preamblecomment;*p;p++) (void)putc(ascii2ebcdic[*p], stderr);
+ for(p=preamblecomment;*p;p++) putc(ascii2ebcdic[*p], stderr);
#else
#ifdef MVSXA /* IBM: MVS/XA */
- for(p=preamblecomment;*p;p++) (void)putc(ascii2ebcdic[*p], stderr);
+ for(p=preamblecomment;*p;p++) putc(ascii2ebcdic[*p], stderr);
#else
- for(p=preamblecomment;*p;p++) (void)putc(*p, stderr);
+ for(p=preamblecomment;*p;p++) putc(*p, stderr);
#endif /* IBM: VM/CMS */
#endif
- (void)fprintf(stderr, "' -> %s\n", oname);
+ fprintf(stderr, "' -> %s\n", oname);
}
} else
skipover(dvibyte());
@@ -83,9 +83,9 @@ prescanpages(void)
#ifdef DEBUG
if (dd(D_PAGE))
#ifdef SHORTINT
- (void)fprintf(stderr,"bop at %ld\n", thispageloc);
+ fprintf(stderr,"bop at %ld\n", thispageloc);
#else /* ~SHORTINT */
- (void)fprintf(stderr,"bop at %d\n", (int)thispageloc);
+ fprintf(stderr,"bop at %d\n", (int)thispageloc);
#endif /* ~SHORTINT */
#endif /* DEBUG */
pagenum = signedquad();
@@ -127,7 +127,7 @@ prescanpages(void)
* be a page that was aborted because the previous section overflowed memory).
*/
pagecount = 0;
- (void)fseek(dvifile, (long)thispageloc, 0);
+ fseek(dvifile, (long)thispageloc, 0);
pagenum = signedquad();
skipover(40);
thissecloc = thispageloc;
@@ -177,9 +177,9 @@ prescanpages(void)
#ifdef DEBUG
if (dd(D_PAGE))
#ifdef SHORTINT
- (void)fprintf(stderr,"bop at %ld\n", thispageloc);
+ fprintf(stderr,"bop at %ld\n", thispageloc);
#else /* ~SHORTINT */
- (void)fprintf(stderr,"bop at %d\n", (int)thispageloc);
+ fprintf(stderr,"bop at %d\n", (int)thispageloc);
#endif /* ~SHORTINT */
#endif /* DEBUG */
pagenum = signedquad();
@@ -222,9 +222,9 @@ prescanpages(void)
#ifdef DEBUG
if (dd(D_PAGE))
#ifdef SHORTINT
- (void)fprintf(stderr,"Have a section: %ld pages at %ld fontmem %ld\n",
+ fprintf(stderr,"Have a section: %ld pages at %ld fontmem %ld\n",
#else /* ~SHORTINT */
- (void)fprintf(stderr,"Have a section: %d pages at %d fontmem %d\n",
+ fprintf(stderr,"Have a section: %d pages at %d fontmem %d\n",
#endif /* ~SHORTINT */
(integer)pagecount, (integer)thissecloc, (integer)thissectionmem);
#endif /* DEBUG */
diff --git a/Build/source/texk/dvipsk/repack.c b/Build/source/texk/dvipsk/repack.c
index 7772c1feb61..631be16e4f6 100644
--- a/Build/source/texk/dvipsk/repack.c
+++ b/Build/source/texk/dvipsk/repack.c
@@ -433,7 +433,7 @@ repack(register chardesctype *cp)
j = tsp - tempstore;
#ifdef DEBUG
if (dd(D_COMPRESS))
- (void)fprintf(stderr,"PK %ld bytes, unpacked %ld, compressed %ld\n",
+ fprintf(stderr,"PK %ld bytes, unpacked %ld, compressed %ld\n",
i-(long)startbytes, (long)((width+7L)/8)*height, j-(long)startbytes-4);
#endif /* DEBUG */
if ( i < j ) {
diff --git a/Build/source/texk/dvipsk/resident.c b/Build/source/texk/dvipsk/resident.c
index 23a92cff753..453911f5f95 100644
--- a/Build/source/texk/dvipsk/resident.c
+++ b/Build/source/texk/dvipsk/resident.c
@@ -151,7 +151,7 @@ residentfont(register fontdesctype *curfnt)
if (p->Fontfile && downloadpspk) {
#ifdef DEBUG
if (dd(D_FONTS))
- (void)fprintf(stderr,"Using PK font %s for <%s>.\n",
+ fprintf(stderr,"Using PK font %s for <%s>.\n",
curfnt->name, p->PSname);
#endif /* DEBUG */
return 0;
@@ -161,7 +161,7 @@ residentfont(register fontdesctype *curfnt)
*/
#ifdef DEBUG
if (dd(D_FONTS))
- (void)fprintf(stderr,"Font %s <%s> is resident.\n",
+ fprintf(stderr,"Font %s <%s> is resident.\n",
curfnt->name, p->PSname);
#endif /* DEBUG */
curfnt->resfont = p;
@@ -381,7 +381,7 @@ getdefaults(const char *s)
fprintf(stderr, "\n");
prettycolumn = 0;
}
- (void)fprintf(stderr, "{%s}", realnameoffile);
+ fprintf(stderr, "{%s}", realnameoffile);
prettycolumn += strlen(realnameoffile) + 2;
}
#ifdef DEBUG
@@ -660,7 +660,7 @@ case 'E' :
error("E in config is disabled. To enable E, set z0 before E");
break;
}
- (void)system(was_inline+1);
+ system(was_inline+1);
#endif
break;
case 'K':
@@ -732,7 +732,7 @@ case 'G':
case 'h' :
if (sscanf(was_inline+1, "%s", PSname) != 1)
bad_config("missing arg to h");
- else (void)add_header(PSname);
+ else add_header(PSname);
break;
case 'i' :
if (sscanf(was_inline+1, "%d", &maxsecsize) != 1)
@@ -769,7 +769,7 @@ default:
bad_config("strange line");
}
}
- (void)fclose(deffile);
+ fclose(deffile);
} else {
if (printer)
{
@@ -805,7 +805,7 @@ getpsinfo(const char *name)
fprintf(stderr, "\n");
prettycolumn = 0;
}
- (void)fprintf(stderr, "{%s}", realnameoffile);
+ fprintf(stderr, "{%s}", realnameoffile);
prettycolumn += strlen(realnameoffile) + 2;
}
while (fgets(was_inline, INLINE_SIZE, deffile)!=NULL) {
@@ -914,7 +914,7 @@ getpsinfo(const char *name)
}
}
}
- (void)fclose(deffile);
+ fclose(deffile);
}
checkstrings();
}
diff --git a/Build/source/texk/dvipsk/scanpage.c b/Build/source/texk/dvipsk/scanpage.c
index 38e6a897b1b..63e6494f53c 100644
--- a/Build/source/texk/dvipsk/scanpage.c
+++ b/Build/source/texk/dvipsk/scanpage.c
@@ -121,9 +121,9 @@ scanpage(void)
#ifdef DEBUG
if (dd(D_PAGE))
#ifdef SHORTINT
- (void)fprintf(stderr,"Scanning page %ld\n", pagenum);
+ fprintf(stderr,"Scanning page %ld\n", pagenum);
#else /* ~SHORTINT */
- (void)fprintf(stderr,"Scanning page %d\n", pagenum);
+ fprintf(stderr,"Scanning page %d\n", pagenum);
#endif /* ~SHORTINT */
#endif /* DEBUG */
curfnt = NULL;
@@ -142,7 +142,7 @@ case 255: /* pTeX's dir or undefined */
case 131: case 136: case 139: /* set4, put4, bop */
case 247: case 248: case 249: /* pre, post, post_post */
case 250: case 251: case 252: case 253: case 254: /* undefined */
- (void)sprintf(errbuf,
+ sprintf(errbuf,
"! DVI file contains unexpected command (%d)",cmd);
error(errbuf);
case 132: case 137: /* eight-byte commands setrule, putrule */
@@ -167,7 +167,7 @@ case 138: case 141: case 142: /* nop, push, pop */
break;
case 130: case 135: /* set3, put3 */
if (noptex) {
- (void)sprintf(errbuf,
+ sprintf(errbuf,
"! DVI file contains unexpected pTeX command (%d)",cmd);
error(errbuf);
}
@@ -176,7 +176,7 @@ case 130: case 135: /* set3, put3 */
goto dochar;
case 129: case 134: /* set2, put2 */
if (noomega) {
- (void)sprintf(errbuf,
+ sprintf(errbuf,
"! DVI file contains unexpected Omega command (%d)",cmd);
error(errbuf);
}
@@ -193,7 +193,7 @@ dochar:
if (curfnt==NULL)
error("! Bad DVI file: no font selected");
if (mychar>=curfnt->maxchars) {
- (void)sprintf(errbuf,"! invalid char %d from font %s", mychar, curfnt->name);
+ sprintf(errbuf,"! invalid char %d from font %s", mychar, curfnt->name);
error(errbuf);
}
if (curfnt->loaded == 2) { /* scanning a virtual font character */
@@ -269,9 +269,9 @@ endofpage:
return(0);
} /* IBM: color */
#ifdef SHORTINT
- (void)fprintf(stderr, "Page %ld may be too complex to print\n", pagenum);
+ fprintf(stderr, "Page %ld may be too complex to print\n", pagenum);
#else /* ~SHORTINT */
- (void)fprintf(stderr, "Page %d may be too complex to print\n", pagenum);
+ fprintf(stderr, "Page %d may be too complex to print\n", pagenum);
#endif /* ~SHORTINT */
/*
* This case should be rare indeed. Even with only 200K of virtual memory,
diff --git a/Build/source/texk/dvipsk/search.c b/Build/source/texk/dvipsk/search.c
index 7259b8ef445..e135ef2cd67 100644
--- a/Build/source/texk/dvipsk/search.c
+++ b/Build/source/texk/dvipsk/search.c
@@ -146,7 +146,7 @@ search(kpse_file_format_type format, const char *file, const char *mode)
char *prog = selfautoloc_prog (GUNZIP);
cmd = concat3 (prog, " -c ", quoted_name);
ret = popen (cmd, "r");
- (void)SET_BINARY(fileno(ret));
+ SET_BINARY(fileno(ret));
to_close = USE_PCLOSE;
free (cmd);
free (quoted_name);
diff --git a/Build/source/texk/dvipsk/skippage.c b/Build/source/texk/dvipsk/skippage.c
index 3af8bc7fd7e..70fca7645b4 100644
--- a/Build/source/texk/dvipsk/skippage.c
+++ b/Build/source/texk/dvipsk/skippage.c
@@ -22,9 +22,9 @@ skippage(void)
#ifdef DEBUG
if (dd(D_PAGE))
#ifdef SHORTINT
- (void)fprintf(stderr,"Skipping page %ld\n", pagenum);
+ fprintf(stderr,"Skipping page %ld\n", pagenum);
#else /* ~SHORTINT */
- (void)fprintf(stderr,"Skipping page %d\n", pagenum);
+ fprintf(stderr,"Skipping page %d\n", pagenum);
#endif /* ~SHORTINT */
#endif /* DEBUG */
/* skipover(40); skip rest of bop command? how did this get in here? */
@@ -39,7 +39,7 @@ case 255: /* pTeX's dir or undefined */
/* illegal commands */
case 139: case 247: case 248: case 249: /* bop, pre, post, post_post */
case 250: case 251: case 252: case 253: case 254: /* undefined */
- (void)sprintf(errbuf,
+ sprintf(errbuf,
"! DVI file contains unexpected command (%d)",cmd);
error(errbuf);
/* eight byte commands */
diff --git a/Build/source/texk/dvipsk/tfmload.c b/Build/source/texk/dvipsk/tfmload.c
index f9a4601a5ab..80024a47312 100644
--- a/Build/source/texk/dvipsk/tfmload.c
+++ b/Build/source/texk/dvipsk/tfmload.c
@@ -48,9 +48,9 @@ tfmopen(register fontdesctype *fd)
d = ofmpath;
#endif
#ifdef MVSXA /* IBM: MVS/XA */
- (void)sprintf(name, "ofm(%s)", n);
+ sprintf(name, "ofm(%s)", n);
#else
- (void)sprintf(name, "%s.ofm", n);
+ sprintf(name, "%s.ofm", n);
#endif
if ((tfmfile=search(d, name, READBIN))!=NULL)
return;
@@ -63,13 +63,13 @@ tfmopen(register fontdesctype *fd)
d = tfmpath;
#endif
#ifdef MVSXA /* IBM: MVS/XA */
- (void)sprintf(name, "tfm(%s)", n);
+ sprintf(name, "tfm(%s)", n);
#else
- (void)sprintf(name, "%s.tfm", n);
+ sprintf(name, "%s.tfm", n);
#endif
if ((tfmfile=search(d, name, READBIN))!=NULL)
return;
- (void)sprintf(errbuf, "Can't open font metric file %s%s",
+ sprintf(errbuf, "Can't open font metric file %s%s",
fd->area, name);
error(errbuf);
error("I will use cmr10.tfm instead, so expect bad output.");
@@ -247,7 +247,7 @@ tfmload(register fontdesctype *curfnt)
scaled = (integer *) xmalloc(nw*sizeof(integer));
for (i=0; i<nw; i++)
scaled[i] = scalewidth(tfm32(), scaledsize);
- (void)fclose(tfmfile);
+ fclose(tfmfile);
if (id == 9 || id == 11) {
for (i=0; i<MAX_CODE; i++) {
diff --git a/Build/source/texk/dvipsk/virtualfont.c b/Build/source/texk/dvipsk/virtualfont.c
index 8160339d649..b849218ba0e 100644
--- a/Build/source/texk/dvipsk/virtualfont.c
+++ b/Build/source/texk/dvipsk/virtualfont.c
@@ -78,9 +78,9 @@ vfopen(register fontdesctype *fd)
error("! VF file name too long in vfopen");
}
#ifdef MVSXA /* IBM: MVS/XA */
- (void)sprintf(name, "vf(%s)", n);
+ sprintf(name, "vf(%s)", n);
#else
- (void)sprintf(name, "%s.vf", n);
+ sprintf(name, "%s.vf", n);
#endif
#ifdef KPATHSEA
if (0 != (vffile=search(vfpath, name, READBIN)))
@@ -165,7 +165,7 @@ virtualfont(register fontdesctype *curfnt)
return (0);
#ifdef DEBUG
if (dd(D_FONTS))
- (void)fprintf(stderr,"Loading virtual font %s at %.1fpt\n",
+ fprintf(stderr,"Loading virtual font %s at %.1fpt\n",
name, (real)scaledsize/(alpha*0x100000));
#endif /* DEBUG */
@@ -200,7 +200,7 @@ virtualfont(register fontdesctype *curfnt)
if (!noptex) {
tfmopen(curfnt); /* We check if parent is jfm or not. */
id = tfm16();
- (void)fclose(tfmfile);
+ fclose(tfmfile);
}
if (id != 9 && id != 11) {
char *msg = concat("Design size mismatch in font ", name);
@@ -264,7 +264,7 @@ virtualfont(register fontdesctype *curfnt)
if (bytesleft < length) {
#ifdef DEBUG
if (dd(D_MEM))
- (void)fprintf(stderr,
+ fprintf(stderr,
#ifdef SHORTINT
"Allocating new raster memory (%ld req, %ld left)\n",
#else
@@ -296,7 +296,7 @@ virtualfont(register fontdesctype *curfnt)
} while (cmd < 243);
if (cmd != 248)
badvf("missing postamble");
- (void)fclose(vffile);
+ fclose(vffile);
curfnt->loaded = 2;
if (maxcc+1<no_of_chars) {
curfnt->chardesc = (chardesctype *)