commit 08dcdb3df139d7eb0758ea663900ad1953e01dfe
parent df202db5a8b324a2f962102891717d6199b1044b
Author: Kyle Milz <krwmilz@gmail.com>
Date: Mon, 13 Sep 2021 22:11:11 +0000
spell Fseek() correctly
Diffstat:
5 files changed, 15 insertions(+), 16 deletions(-)
diff --git a/dvi-draw.c b/dvi-draw.c
@@ -706,7 +706,7 @@ set_char(wide_ubyte ch)
if (currinf.fontp->ft == NULL) /* if not freetype font */
{
open_font_file(currinf.fontp);
- Fseek(currinf.fontp->file, g->addr, 0);
+ fseek(currinf.fontp->file, g->addr, 0);
}
(*currinf.fontp->read_char)(currinf.fontp, ch);
if (debug & DBG_BITMAP) print_char((ubyte) ch, g);
@@ -1201,7 +1201,7 @@ geom_do_char(g_info, ch)
if (currinf.fontp->ft == NULL)
{
open_font_file(currinf.fontp);
- Fseek(currinf.fontp->file, g->addr, 0);
+ fseek(currinf.fontp->file, g->addr, 0);
}
(*currinf.fontp->read_char)(currinf.fontp, ch);
if (debug & DBG_BITMAP) print_char((ubyte) ch, g);
diff --git a/dvi-init.c b/dvi-init.c
@@ -503,10 +503,10 @@ find_postamble()
ubyte *p1;
ubyte byte;
- Fseek(dvi_file, (long) 0, 2);
+ fseek(dvi_file, (long) 0, 2);
pos = ftell(dvi_file) - TMPSIZ;
if (pos < 0) pos = 0;
- Fseek(dvi_file, pos, 0);
+ fseek(dvi_file, pos, 0);
p = temp + fread((char *) temp, sizeof(char), TMPSIZ, dvi_file);
for (;;) {
p1 = p;
@@ -521,14 +521,14 @@ find_postamble()
pos += p - temp;
byte = *p;
while (byte == TRAILER) {
- Fseek(dvi_file, --pos, 0);
+ fseek(dvi_file, --pos, 0);
byte = one(dvi_file);
}
if (byte != 2)
/* Wrong version of DVI output for this program */
return False;
- Fseek(dvi_file, pos - 4, 0);
- Fseek(dvi_file, sfour(dvi_file), 0);
+ fseek(dvi_file, pos - 4, 0);
+ fseek(dvi_file, sfour(dvi_file), 0);
return True;
}
@@ -673,14 +673,14 @@ prepare_pages()
i = total_pages;
page_info[--i].offset = last_page_offset;
- Fseek(dvi_file, last_page_offset, 0);
+ fseek(dvi_file, last_page_offset, 0);
/*
* Follow back pointers through pages in the DVI file,
* storing the offsets in the page_info[].offset table.
*/
while (i > 0) {
- Fseek(dvi_file, (long) (1+4+(9*4)), 1);
- Fseek(dvi_file, page_info[--i].offset = four(dvi_file), 0);
+ fseek(dvi_file, (long) (1+4+(9*4)), 1);
+ fseek(dvi_file, page_info[--i].offset = four(dvi_file), 0);
}
}
@@ -797,7 +797,7 @@ reload_dvi_file()
for (fontp = font_head; fontp != NULL; fontp = fontp->next)
fontp->flags &= ~FONT_IN_USE;
- Fseek(dvi_file, (long) 0, 0);
+ fseek(dvi_file, (long) 0, 0);
if (!init_dvi_file())
return False;
if (list_fonts)
diff --git a/pk.c b/pk.c
@@ -311,7 +311,7 @@ read_PK_index(struct font *fontp, Boolean hushcs)
if (debug & DBG_PK)
Printf("Reading PK pixel file %s\n", fontp->filename);
- Fseek(fontp->file, (long) one(fontp->file), 1); /* skip comment */
+ fseek(fontp->file, (long) one(fontp->file), 1); /* skip comment */
(void) four(fontp->file); /* skip design size */
checksum = four(fontp->file);
@@ -350,7 +350,7 @@ read_PK_index(struct font *fontp, Boolean hushcs)
}
fontp->glyph[ch].addr = ftell(fontp->file);
fontp->glyph[ch].x2 = PK_flag_byte;
- Fseek(fontp->file, (long) bytes_left, 1);
+ fseek(fontp->file, (long) bytes_left, 1);
if (debug & DBG_PK)
Printf("Scanning pk char %u, at %ld.\n", ch,
fontp->glyph[ch].addr);
diff --git a/vf.c b/vf.c
@@ -70,7 +70,7 @@ read_VF_index(struct font *fontp, Boolean hushcs)
/*
* Read preamble.
*/
- Fseek(VF_file, (long) one(VF_file), 1); /* skip comment */
+ fseek(VF_file, (long) one(VF_file), 1); /* skip comment */
checksum = four(VF_file);
if (checksum != fontp->checksum && checksum != 0 && fontp->checksum != 0
&& !hushcs)
@@ -111,7 +111,7 @@ read_VF_index(struct font *fontp, Boolean hushcs)
if (cc >= 256) {
warnx("Virtual character %lu in font '%s' ignored.",
cc, fontp->fontname);
- Fseek(VF_file, (long) len, 1);
+ fseek(VF_file, (long) len, 1);
continue;
}
}
diff --git a/xdvi.h b/xdvi.h
@@ -48,7 +48,6 @@ NOTE:
#endif
#define Printf (void) printf
-#define Fseek (void) fseek
/********************************
* Types and data *