commit b6b0d017fdb287e96d94dbf21b475ac455f02af6
parent de057f9ef5a4c3a1d553133a1d8606601090b639
Author: Kyle Milz <krwmilz@gmail.com>
Date: Sun, 12 Mar 2023 23:45:37 +0000
use variable names identical to dvitype manual
Diffstat:
1 file changed, 10 insertions(+), 11 deletions(-)
diff --git a/dvi-init.c b/dvi-init.c
@@ -477,18 +477,17 @@ dvi_magic_ok(FILE *dvi)
* it into global variables for later use.
*/
static Boolean
-process_preamble(long *numerator, long *denominator)
+process_preamble(long *n, long *d)
{
char comment[256 + 1];
size_t k;
if (dvi_magic_ok(dvi_file) == False)
return False;
- *numerator = four(dvi_file);
- *denominator = four(dvi_file);
+ *n = four(dvi_file); /* numerator */
+ *d = four(dvi_file); /* denominator */
magnification = four(dvi_file);
- dimconv = (((double) *numerator * magnification)
- / ((double) *denominator * 1000.));
+ dimconv = (((double) (*n) * magnification) / ((double) (*d) * 1000.));
dimconv = dimconv * (((long) pixels_per_inch)<<16) / 254000;
tpic_conv = pixels_per_inch * magnification / 1000000.0;
k = one(dvi_file);
@@ -558,7 +557,7 @@ find_postamble(void)
* used in the job.
*/
static Boolean
-read_postamble(long *last_page_offset, long numerator, long denominator)
+read_postamble(long *last_page_offset, long n, long d)
{
unsigned char cmnd;
Boolean font_not_found;
@@ -571,9 +570,9 @@ read_postamble(long *last_page_offset, long numerator, long denominator)
*last_page_offset = four(dvi_file);
/* Check postamble duplicates match preamble. */
- if (numerator != four(dvi_file))
+ if (n != four(dvi_file))
return False;
- if (denominator != four(dvi_file))
+ if (d != four(dvi_file))
return False;
if (magnification != four(dvi_file))
return False;
@@ -776,14 +775,14 @@ set_titles(void)
Boolean
init_dvi_file(void)
{
- long numerator, denominator;
+ long n, d;
long last_page_offset;
- if (!process_preamble(&numerator, &denominator))
+ if (!process_preamble(&n, &d))
goto err;
if (!find_postamble())
goto err;
- if (!read_postamble(&last_page_offset, numerator, denominator))
+ if (!read_postamble(&last_page_offset, n, d))
goto err;
prepare_pages(last_page_offset);