リビジョン | 142c4c0631afd4f84c449774b684863acfa7a63e (tree) |
---|---|
日時 | 2014-07-28 20:48:16 |
作者 | maqiyuan <maqiyuan@user...> |
コミッター | maqiyuan |
removed closed_already.
@@ -111,8 +111,7 @@ void search_mem_(pointer p); | ||
111 | 111 | void short_display_(integer p); |
112 | 112 | #define short_display(p) short_display_((integer) (p)) |
113 | 113 | void print_font_and_char(integer p); |
114 | -void print_mark_(integer p); | |
115 | -#define print_mark(p) print_mark_((integer) (p)) | |
114 | +void print_mark (integer p); | |
116 | 115 | void print_rule_dimen (scaled d); |
117 | 116 | void print_glue_(scaled d, integer order, const char * s); |
118 | 117 | #define print_glue(d, order, s) print_glue_((scaled) (d), (integer) (order), (const char *) (s)) |
@@ -250,8 +249,7 @@ void dvi_four_(integer x); | ||
250 | 249 | #define dvi_four(x) dvi_four_((integer) (x)) |
251 | 250 | void dvi_pop_(integer l); |
252 | 251 | #define dvi_pop(l) dvi_pop_((integer) (l)) |
253 | -void dvi_font_def_(internal_font_number f); | |
254 | -#define dvi_font_def(f) dvi_font_def_((internal_font_number) (f)) | |
252 | +void dvi_font_def (internal_font_number f); | |
255 | 253 | void movement (scaled w, eight_bits o); |
256 | 254 | void special_out (pointer p); |
257 | 255 | void hlist_out (void); |
@@ -281,8 +279,7 @@ pointer math_glue (pointer g, scaled m); | ||
281 | 279 | void math_kern (pointer p, scaled m); |
282 | 280 | void flush_math (void); |
283 | 281 | pointer clean_box (pointer p, small_number s); |
284 | -void fetch_(pointer a); | |
285 | -#define fetch(a) fetch_((pointer) (a)) | |
282 | +void fetch (pointer a); | |
286 | 283 | void make_over (pointer q); |
287 | 284 | void make_under (pointer q); |
288 | 285 | void make_vcenter (pointer q); |
@@ -346,8 +343,7 @@ void begin_box (integer box_content); | ||
346 | 343 | void scan_box_(integer box_content); |
347 | 344 | #define scan_box(box_context) scan_box_((integer) (box_context)) |
348 | 345 | void package (small_number c); |
349 | -small_number norm_min_(integer h); | |
350 | -#define norm_min(h) norm_min_((integer) (h)) | |
346 | +small_number norm_min (integer h); | |
351 | 347 | void new_graf (boolean indented); |
352 | 348 | void indent_in_hmode (void); |
353 | 349 | void head_for_vmode (void); |
@@ -66,6 +66,7 @@ const char * banner = "This is TeX, Version 3.14159265"; | ||
66 | 66 | void print_banner (void) |
67 | 67 | { |
68 | 68 | char dist_ver[256]; |
69 | + memset(dist_ver, 0, sizeof(dist_ver)); | |
69 | 70 | sprintf(dist_ver, "%s (%s %s/%s)", banner, application, yandyversion, dist); |
70 | 71 | prints(dist_ver); |
71 | 72 | } |
@@ -82,7 +83,6 @@ char log_line[256]; | ||
82 | 83 | |
83 | 84 | boolean mem_spec_flag = false; |
84 | 85 | boolean format_spec = false; |
85 | -int closed_already = 0; /* make sure we don't try this more than once */ | |
86 | 86 | boolean reorder_arg_flag = true; /* put command line flags/arguments first */ |
87 | 87 | |
88 | 88 | /* Mapping from Windows ANSI to DOS code page 850 96/Jan/20 */ |
@@ -142,7 +142,7 @@ void scivilize (char * date) | ||
142 | 142 | int k; |
143 | 143 | char pyear[6]; |
144 | 144 | |
145 | - strcpy (pyear, date + 7); | |
145 | + strcpy(pyear, date + 7); | |
146 | 146 | |
147 | 147 | for (k = 5; k >= 0; k--) |
148 | 148 | date[k + 5] = date[k]; |
@@ -212,7 +212,7 @@ void read_xchr_sub (FILE * xchr_input) | ||
212 | 212 | |
213 | 213 | if (from >= 0 && from < MAXCHRS && to >= 0 && to < MAXCHRS) |
214 | 214 | { |
215 | - if (xchr[from] == (unsigned char) NOTDEF) | |
215 | + if (xchr[from] == NOTDEF) | |
216 | 216 | xchr[from] = (unsigned char) to; |
217 | 217 | else |
218 | 218 | printf("NOTE: %s collision: %d => %d, %d\n", "xchr", from, xchr[from], to); |
@@ -2933,7 +2933,6 @@ int main_init (int ac, char ** av) | ||
2933 | 2933 | underfull_hbox = 0; |
2934 | 2934 | overfull_vbox = 0; |
2935 | 2935 | underfull_vbox = 0; |
2936 | - closed_already = 0; | |
2937 | 2936 | |
2938 | 2937 | if (trace_flag) |
2939 | 2938 | puts("Entering main_init() (local.c)."); |
@@ -1964,7 +1964,7 @@ void print_font_and_char (integer p) | ||
1964 | 1964 | } |
1965 | 1965 | } |
1966 | 1966 | /* sec 0176 */ |
1967 | -void print_mark_ (integer p) | |
1967 | +void print_mark (integer p) | |
1968 | 1968 | { |
1969 | 1969 | print_char('{'); |
1970 | 1970 |
@@ -145,7 +145,7 @@ void dvi_pop_(integer l) | ||
145 | 145 | dvi_out(pop); |
146 | 146 | } |
147 | 147 | /* sec 0602 */ |
148 | -void dvi_font_def_(internal_font_number f) | |
148 | +void dvi_font_def (internal_font_number f) | |
149 | 149 | { |
150 | 150 | pool_pointer k; |
151 | 151 |
@@ -201,7 +201,7 @@ found: | ||
201 | 201 | return x; |
202 | 202 | } |
203 | 203 | /* sec 0722 */ |
204 | -void fetch_(pointer a) | |
204 | +void fetch (pointer a) | |
205 | 205 | { |
206 | 206 | cur_c = character(a); |
207 | 207 | cur_f = fam_fnt(fam(a) + cur_size); |
@@ -909,7 +909,7 @@ void scan_box_(integer box_context) | ||
909 | 909 | } |
910 | 910 | } |
911 | 911 | /* sec 1091 */ |
912 | -small_number norm_min_ (integer h) | |
912 | +small_number norm_min (integer h) | |
913 | 913 | { |
914 | 914 | if (h <= 0) |
915 | 915 | return 1; |
@@ -87,12 +87,6 @@ void close_files_and_terminate (void) | ||
87 | 87 | { |
88 | 88 | integer k; |
89 | 89 | |
90 | - if (closed_already++) | |
91 | - { | |
92 | - puts("close_files_and_terminated() already "); | |
93 | - return; | |
94 | - } | |
95 | - | |
96 | 90 | if (trace_flag) |
97 | 91 | puts("\nclose_files_and_terminate() "); |
98 | 92 |
@@ -795,7 +795,6 @@ extern char * aux_directory; | ||
795 | 795 | extern char * fmt_directory; |
796 | 796 | extern char * pdf_directory; |
797 | 797 | extern clock_t start_time, main_time, finish_time; |
798 | -extern int closed_already; | |
799 | 798 | |
800 | 799 | extern memory_word * allocate_main_memory (int size); |
801 | 800 | extern memory_word * realloc_main (int lo_size, int hi_size); |