From 142c4c0631afd4f84c449774b684863acfa7a63e Mon Sep 17 00:00:00 2001 From: maqiyuan Date: Mon, 28 Jul 2014 19:48:16 +0800 Subject: [PATCH] removed closed_already. --- src/texsourc/coerce.h | 12 ++++-------- src/texsourc/local.c | 7 +++---- src/texsourc/tex0.c | 2 +- src/texsourc/tex4.c | 2 +- src/texsourc/tex5.c | 2 +- src/texsourc/tex7.c | 2 +- src/texsourc/tex9.c | 6 ------ src/texsourc/yandytex.h | 1 - 8 files changed, 11 insertions(+), 23 deletions(-) diff --git a/src/texsourc/coerce.h b/src/texsourc/coerce.h index c0ad215..97c985d 100644 --- a/src/texsourc/coerce.h +++ b/src/texsourc/coerce.h @@ -111,8 +111,7 @@ void search_mem_(pointer p); void short_display_(integer p); #define short_display(p) short_display_((integer) (p)) void print_font_and_char(integer p); -void print_mark_(integer p); -#define print_mark(p) print_mark_((integer) (p)) +void print_mark (integer p); void print_rule_dimen (scaled d); void print_glue_(scaled d, integer order, const char * s); #define print_glue(d, order, s) print_glue_((scaled) (d), (integer) (order), (const char *) (s)) @@ -250,8 +249,7 @@ void dvi_four_(integer x); #define dvi_four(x) dvi_four_((integer) (x)) void dvi_pop_(integer l); #define dvi_pop(l) dvi_pop_((integer) (l)) -void dvi_font_def_(internal_font_number f); -#define dvi_font_def(f) dvi_font_def_((internal_font_number) (f)) +void dvi_font_def (internal_font_number f); void movement (scaled w, eight_bits o); void special_out (pointer p); void hlist_out (void); @@ -281,8 +279,7 @@ pointer math_glue (pointer g, scaled m); void math_kern (pointer p, scaled m); void flush_math (void); pointer clean_box (pointer p, small_number s); -void fetch_(pointer a); -#define fetch(a) fetch_((pointer) (a)) +void fetch (pointer a); void make_over (pointer q); void make_under (pointer q); void make_vcenter (pointer q); @@ -346,8 +343,7 @@ void begin_box (integer box_content); void scan_box_(integer box_content); #define scan_box(box_context) scan_box_((integer) (box_context)) void package (small_number c); -small_number norm_min_(integer h); -#define norm_min(h) norm_min_((integer) (h)) +small_number norm_min (integer h); void new_graf (boolean indented); void indent_in_hmode (void); void head_for_vmode (void); diff --git a/src/texsourc/local.c b/src/texsourc/local.c index 2e9ebe2..87e00f6 100644 --- a/src/texsourc/local.c +++ b/src/texsourc/local.c @@ -66,6 +66,7 @@ const char * banner = "This is TeX, Version 3.14159265"; void print_banner (void) { char dist_ver[256]; + memset(dist_ver, 0, sizeof(dist_ver)); sprintf(dist_ver, "%s (%s %s/%s)", banner, application, yandyversion, dist); prints(dist_ver); } @@ -82,7 +83,6 @@ char log_line[256]; boolean mem_spec_flag = false; boolean format_spec = false; -int closed_already = 0; /* make sure we don't try this more than once */ boolean reorder_arg_flag = true; /* put command line flags/arguments first */ /* Mapping from Windows ANSI to DOS code page 850 96/Jan/20 */ @@ -142,7 +142,7 @@ void scivilize (char * date) int k; char pyear[6]; - strcpy (pyear, date + 7); + strcpy(pyear, date + 7); for (k = 5; k >= 0; k--) date[k + 5] = date[k]; @@ -212,7 +212,7 @@ void read_xchr_sub (FILE * xchr_input) if (from >= 0 && from < MAXCHRS && to >= 0 && to < MAXCHRS) { - if (xchr[from] == (unsigned char) NOTDEF) + if (xchr[from] == NOTDEF) xchr[from] = (unsigned char) to; else printf("NOTE: %s collision: %d => %d, %d\n", "xchr", from, xchr[from], to); @@ -2933,7 +2933,6 @@ int main_init (int ac, char ** av) underfull_hbox = 0; overfull_vbox = 0; underfull_vbox = 0; - closed_already = 0; if (trace_flag) puts("Entering main_init() (local.c)."); diff --git a/src/texsourc/tex0.c b/src/texsourc/tex0.c index 09d448c..36873c2 100644 --- a/src/texsourc/tex0.c +++ b/src/texsourc/tex0.c @@ -1964,7 +1964,7 @@ void print_font_and_char (integer p) } } /* sec 0176 */ -void print_mark_ (integer p) +void print_mark (integer p) { print_char('{'); diff --git a/src/texsourc/tex4.c b/src/texsourc/tex4.c index 7f3ade6..8ba3f70 100644 --- a/src/texsourc/tex4.c +++ b/src/texsourc/tex4.c @@ -145,7 +145,7 @@ void dvi_pop_(integer l) dvi_out(pop); } /* sec 0602 */ -void dvi_font_def_(internal_font_number f) +void dvi_font_def (internal_font_number f) { pool_pointer k; diff --git a/src/texsourc/tex5.c b/src/texsourc/tex5.c index 992b520..5da5ef6 100644 --- a/src/texsourc/tex5.c +++ b/src/texsourc/tex5.c @@ -201,7 +201,7 @@ found: return x; } /* sec 0722 */ -void fetch_(pointer a) +void fetch (pointer a) { cur_c = character(a); cur_f = fam_fnt(fam(a) + cur_size); diff --git a/src/texsourc/tex7.c b/src/texsourc/tex7.c index fb66760..8f86234 100644 --- a/src/texsourc/tex7.c +++ b/src/texsourc/tex7.c @@ -909,7 +909,7 @@ void scan_box_(integer box_context) } } /* sec 1091 */ -small_number norm_min_ (integer h) +small_number norm_min (integer h) { if (h <= 0) return 1; diff --git a/src/texsourc/tex9.c b/src/texsourc/tex9.c index 5e07d68..4b5c628 100644 --- a/src/texsourc/tex9.c +++ b/src/texsourc/tex9.c @@ -87,12 +87,6 @@ void close_files_and_terminate (void) { integer k; - if (closed_already++) - { - puts("close_files_and_terminated() already "); - return; - } - if (trace_flag) puts("\nclose_files_and_terminate() "); diff --git a/src/texsourc/yandytex.h b/src/texsourc/yandytex.h index 1f25372..026a8b8 100644 --- a/src/texsourc/yandytex.h +++ b/src/texsourc/yandytex.h @@ -795,7 +795,6 @@ extern char * aux_directory; extern char * fmt_directory; extern char * pdf_directory; extern clock_t start_time, main_time, finish_time; -extern int closed_already; extern memory_word * allocate_main_memory (int size); extern memory_word * realloc_main (int lo_size, int hi_size); -- 2.11.0