1 --- texlive-20080816-source/libs/icu-xetex/tools/ctestfw/uperf.cpp~ 2008-03-04 14:26:36.000000000 +0100
2 +++ texlive-20080816-source/libs/icu-xetex/tools/ctestfw/uperf.cpp 2012-12-05 13:40:23.702450798 +0100
4 this->runIndexedTest( index, FALSE, name );
7 - fprintf(stdout,name);
8 - fprintf(stdout,"\n");
9 + fprintf(stdout,"%s\n", name);
11 }while (name && (name[0] != 0));
12 verbose = save_verbose;
13 --- texlive-20080816-source/texk/web2c/cwebdir/common.w~ 2008-04-28 11:22:39.000000000 +0200
14 +++ texlive-20080816-source/texk/web2c/cwebdir/common.w 2012-12-05 13:43:03.025778512 +0100
22 history=fatal_message; exit(wrap_up());
24 --- texlive-20080816-source/texk/web2c/cwebdir/cweave.w~ 2008-04-28 11:22:39.000000000 +0200
25 +++ texlive-20080816-source/texk/web2c/cwebdir/cweave.w 2012-12-05 13:48:17.152434099 +0100
27 print_cat(c) /* symbolic printout of a category */
30 - printf(cat_name[c]);
34 @ The token lists for translated \TEX/ output contain some special control
35 --- texlive-20080816-source/texk/web2c/cwebboot.c~ 2012-12-05 13:43:15.382444744 +0100
36 +++ texlive-20080816-source/texk/web2c/cwebboot.c 2012-12-05 13:47:45.715768541 +0100
38 fatal P2C(char*,s,char*,t)
39 #line 1182 "./cwebdir/common.w"
44 history= fatal_message;exit(wrap_up());
46 --- texlive-20080816-source/texk/web2c/tiedir/tie.w~ 2006-01-17 22:41:51.000000000 +0100
47 +++ texlive-20080816-source/texk/web2c/tiedir/tie.w 2012-12-05 13:50:25.915762890 +0100
49 @d new_line(v) fputc('\n',v) /* start new line */
50 @d term_new_line new_line(term_out)
51 /* start new line of the terminal */
52 -@d print_ln(v) {fprintf(term_out,v);term_new_line;}
53 +@d print_ln(v) {fputs(v,term_out);term_new_line;}
54 /* `|print|' and then start new line */
55 @d print2_ln(a,b) {print2(a,b);term_new_line;} /* same with two arguments */
56 @d print3_ln(a,b,c) {print3(a,b,c);term_new_line;}
57 --- texlive-20080816-source/texk/web2c/pdftexdir/subfont.c~ 2008-05-08 16:25:16.000000000 +0200
58 +++ texlive-20080816-source/texk/web2c/pdftexdir/subfont.c 2012-12-05 13:52:33.919091705 +0100
63 - tex_printf(cur_file_name);
64 + tex_printf("%s", cur_file_name);
65 sfd = new_sfd_entry();
66 sfd->name = xstrdup(sfd_name);
68 --- texlive-20080816-source/texk/web2c/omegafonts/out_routines.c~ 2006-01-17 22:41:51.000000000 +0100
69 +++ texlive-20080816-source/texk/web2c/omegafonts/out_routines.c 2012-12-05 14:00:41.645741167 +0100
74 - fprintf(file_output, sval);
75 + fputs(sval, file_output);
77 --- texlive-20080816-source/texk/web2c/omegafonts/error_routines.c.orig 2006-01-17 22:41:51.000000000 +0100
78 +++ texlive-20080816-source/texk/web2c/omegafonts/error_routines.c 2012-12-05 13:59:28.005743765 +0100
83 +#if defined(__GNUC__) && (__GNUC__ >= 3)
89 +lex_error(string fmt, ...)
93 + fprintf(stderr, "line %d (lexing): ", line_number);
95 + vfprintf(stderr, fmt, ap);
97 + fprintf(stderr, "\n");
101 +fatal_error(string fmt, ...)
105 + fprintf(stderr, "line %d (fatal): ", line_number);
107 + vfprintf(stderr, fmt, ap);
109 + fprintf(stderr, "\n");
116 + fprintf(stderr, "line %d (parsing): ", line_number);
117 + fprintf(stderr, "%s", fmt);
118 + fprintf(stderr, "\n");
122 +warning_(string fmt, ...)
126 + fprintf(stderr, "line %d (warning): ", line_number);
128 + vfprintf(stderr, fmt, ap);
130 + fprintf(stderr, "\n");
134 +internal_error(string fmt, ...)
138 + fprintf(stderr, "line %d (internal): ", line_number);
140 + vfprintf(stderr, fmt, ap);
142 + fprintf(stderr, "\n");
149 lex_error_0(string fmt)
152 fprintf(stderr, "\n");
156 --- texlive-20080816-source/texk/web2c/omegafonts/error_routines.h.orig 2012-12-05 13:59:34.879076856 +0100
157 +++ texlive-20080816-source/texk/web2c/omegafonts/error_routines.h 2012-12-05 14:00:00.305742626 +0100
159 59 Temple Place, Suite 330, Boston, MA 02111-1307, USA.
163 +#if defined(__GNUC__) && (__GNUC__ >= 3)
164 +#define lex_error_0(a) lex_error("%s", a)
165 +#define lex_error_1(a, b) lex_error(a, b)
166 +#define lex_error_s(a, b) lex_error(a, b)
167 +#define lex_error_s_1(a, b, c) lex_error(a, b, c)
168 +extern void lex_error(string, ...) __attribute__ ((format (printf, 1, 2)));
169 +#define fatal_error_0(a) fatal_error("%s", a)
170 +#define fatal_error_1(a, b) fatal_error(a, b)
171 +#define fatal_error_2(a, b, c) fatal_error(a, b, c)
172 +#define fatal_error_s(a, b) fatal_error(a, b)
173 +extern void fatal_error(string, ...) __attribute__ ((format (printf, 1, 2)));
174 +extern void yyerror(string);
175 +#define warning_0(a) warning_("%s", a)
176 +#define warning_1(a, b) warning_(a, b)
177 +#define warning_2(a, b, c) warning_(a, b, c)
178 +#define warning_s(a, b) warning_(a, b)
179 +#define warning_s_1(a, b, c) warning_(a, b, c)
180 +#define warning_s_2(a, b, c, d) warning_(a, b, c, d)
181 +extern void warning_(string, ...) __attribute__ ((format (printf, 1, 2)));
182 +#define internal_error_0(a) internal_error("%s", a)
183 +#define internal_error_1(a, b) internal_error(a, b)
184 +#define internal_error_s(a, b) internal_error(a, b)
185 +extern void internal_error(string, ...) __attribute__ ((format (printf, 1, 2)));
187 extern void lex_error_0(string);
188 extern void lex_error_1(string, int);
189 extern void lex_error_s(string, string);
191 extern void internal_error_0(string);
192 extern void internal_error_1(string, int);
193 extern void internal_error_s(string, string);
197 --- texlive-20080816-source/texk/devnag/src/devnag.c~ 2008-07-03 23:45:54.000000000 +0200
198 +++ texlive-20080816-source/texk/devnag/src/devnag.c 2012-12-05 14:02:07.348229812 +0100
199 @@ -2396,7 +2396,7 @@
200 void err_ill(char *str) {
201 fprintf(stderr, "Error: illegal character(s) \"%s\" detected at line %d:\n",
203 - fprintf(stderr, inbuf);
204 + fputs(inbuf, stderr);
208 --- texlive-20080816-source/texk/dvidvi/dvidvi.c.orig 2012-12-05 14:02:36.438365452 +0100
209 +++ texlive-20080816-source/texk/dvidvi/dvidvi.c 2012-12-05 14:03:19.851697257 +0100
211 * Print a usage error messsage, and quit.
214 - (void)fprintf(stderr,banner);
215 + (void)fprintf(stderr,"%s", banner);
216 (void)fprintf(stderr,"Usage: dvidvi [options] input[.dvi] [output]\n");
217 (void)fprintf(stderr,"where options are:\n");
218 (void)fprintf(stderr," [-f n] first page printed [-l n] last page printed\n");
220 } /* else argument with '-' */
223 - (void)fprintf(stderr, banner) ;
224 + (void)fprintf(stderr, "%s", banner) ;
225 error("! no input file specified");
227 /* Inserted by djc@dsmail.hmi.de 3.8.1994 */
231 if (*oname != 0 && !quiet) {
232 - (void)fprintf(stderr, banner) ;
233 + (void)fprintf(stderr, "%s", banner) ;
234 (void)fprintf(stderr, "%s -> %s\n",iname,oname);
237 --- texlive-20080816-source/texk/dvipdfm/error.h~ 2006-01-17 22:41:51.000000000 +0100
238 +++ texlive-20080816-source/texk/dvipdfm/error.h 2012-12-05 14:05:35.501692469 +0100
242 #define ERROR(string) { \
243 - fprintf(stderr, "\n"); \
244 - fprintf (stderr, string); \
245 - fprintf (stderr, "\n"); \
246 + fputs ("\n", stderr); \
247 + fputs (string, stderr); \
248 + fputs ("\n", stderr); \
252 --- texlive-20080816-source/texk/ps2pkm/objects.h~ 2006-01-17 22:41:51.000000000 +0100
253 +++ texlive-20080816-source/texk/ps2pkm/objects.h 2012-12-05 14:08:58.475018644 +0100
256 /* NDW: personally, I want to see status and error messages! */
257 #define IfTrace0(condition,model) \
258 - {if (condition) printf(model);}
259 + {if (condition) puts(model);}
260 #define IfTrace1(condition,model,arg0) \
261 {if (condition) printf(model,arg0);}
262 #define IfTrace2(condition,model,arg0,arg1) \
263 --- texlive-20080816-source/texk/tex4htk/tex4ht.c.orig 2012-12-05 14:09:57.661683224 +0100
264 +++ texlive-20080816-source/texk/tex4htk/tex4ht.c 2012-12-05 14:14:25.335007114 +0100
265 @@ -1628,11 +1628,11 @@
266 if( no_root_file ){ open_o_file(); }
269 - (IGNORED) fprintf(cur_o_file, end_span[0]);
270 + (IGNORED) fputs(end_span[0], cur_o_file);
274 - (IGNORED) fprintf(cur_o_file, t_accent_fifth);
275 + (IGNORED) fputs(t_accent_fifth, cur_o_file);
276 needs_end_accent = FALSE;
277 needs_accented_sym--;
279 @@ -1662,11 +1662,11 @@
280 if( no_root_file ){ open_o_file(); }
283 - (IGNORED) fprintf(cur_o_file, end_span[0]);
284 + (IGNORED) fputs(end_span[0], cur_o_file);
288 - (IGNORED) fprintf(cur_o_file, t_accent_fifth);
289 + (IGNORED) fputs(t_accent_fifth, cur_o_file);
290 needs_end_accent = FALSE;
291 needs_accented_sym--;
293 @@ -1810,11 +1810,11 @@
294 if( no_root_file ){ open_o_file(); }
297 - (IGNORED) fprintf(cur_o_file, end_span[0]);
298 + (IGNORED) fputs(end_span[0], cur_o_file);
302 - (IGNORED) fprintf(cur_o_file, t_accent_fifth);
303 + (IGNORED) fputs(t_accent_fifth, cur_o_file);
304 needs_end_accent = FALSE;
305 needs_accented_sym--;
307 @@ -2884,7 +2884,7 @@
309 (IGNORED) fprintf(stderr,
310 "\n----------------------------------------------------\n");
311 - (IGNORED) fprintf(stderr, "environment file\n");
312 + (IGNORED) fputs("environment file\n", stderr);
313 (IGNORED) fprintf(stderr,
314 "----------------------------------------------------\n");
315 while( (ch = getc(dot_file)) != EOF ){
316 @@ -2978,7 +2978,7 @@
317 i = i * 10 + ch - '0'; ch = get_html_ch(file); }
320 -(IGNORED) fprintf(stderr,"--- warning --- ");
321 +(IGNORED) fputs("--- warning --- ",stderr);
322 (IGNORED) fprintf(stderr,warn_err_mssg[22]
324 , new_font_name, i, bound); show_err_context();
325 @@ -4573,11 +4573,11 @@
326 if( no_root_file ){ open_o_file(); }
329 - (IGNORED) fprintf(cur_o_file, end_span[0]);
330 + (IGNORED) fputs(end_span[0], cur_o_file);
334 - (IGNORED) fprintf(cur_o_file, t_accent_fifth);
335 + (IGNORED) fputs(t_accent_fifth, cur_o_file);
336 needs_end_accent = FALSE;
337 needs_accented_sym--;
339 @@ -4597,7 +4597,7 @@
342 if( span_open[0] ) if( *span_open[0] )
343 - (IGNORED) fprintf(cur_o_file, span_open[0]);
344 + (IGNORED) fputs(span_open[0], cur_o_file);
345 if( span_name[0] ) if( *span_name[0] )
346 (IGNORED) fprintf(cur_o_file,
347 span_name[0], font_tbl[cur_fnt].family_name);
348 @@ -4609,7 +4609,7 @@
349 (IGNORED) fprintf(cur_o_file,
350 span_mag[0], font_tbl[cur_fnt].mag);
351 if( span_ch[0] ) if( *span_ch[0] )
352 - (IGNORED) fprintf(cur_o_file, span_ch[0]);
353 + (IGNORED) fputs(span_ch[0], cur_o_file);
357 @@ -5335,7 +5335,7 @@
360 if( a_accent_template && needs_accented_sym ){
361 - (IGNORED) fprintf(cur_o_file, a_accent_fifth);
362 + (IGNORED) fputs(a_accent_fifth, cur_o_file);
366 @@ -5395,11 +5395,11 @@
367 if( no_root_file ){ open_o_file(); }
370 - (IGNORED) fprintf(cur_o_file, end_span[0]);
371 + (IGNORED) fputs(end_span[0], cur_o_file);
375 - (IGNORED) fprintf(cur_o_file, t_accent_fifth);
376 + (IGNORED) fputs(t_accent_fifth, cur_o_file);
377 needs_end_accent = FALSE;
378 needs_accented_sym--;
380 @@ -5656,8 +5656,8 @@
384 -{ (IGNORED) fprintf(stderr,"--- warning --- ");
385 - (IGNORED) fprintf(stderr,warn_err_mssg[n]);
386 +{ (IGNORED) fputs("--- warning --- ",stderr);
387 + (IGNORED) fputs(warn_err_mssg[n],stderr);
391 @@ -5677,7 +5677,7 @@
395 -{ (IGNORED) fprintf(stderr,"--- warning --- ");
396 +{ (IGNORED) fputs("--- warning --- ",stderr);
397 (IGNORED) fprintf(stderr, warn_err_mssg[n], i);
400 @@ -5698,7 +5698,7 @@
404 -{ (IGNORED) fprintf(stderr,"--- warning --- ");
405 +{ (IGNORED) fputs("--- warning --- ",stderr);
406 (IGNORED) fprintf(stderr, warn_err_mssg[n], i, j);
409 @@ -5724,7 +5724,7 @@
413 - (IGNORED) fprintf(stderr,"--- warning --- ");
414 + (IGNORED) fputs("--- warning --- ",stderr);
415 (IGNORED) fprintf(stderr,warn_err_mssg[n], str);
418 @@ -5751,7 +5751,7 @@
422 -{ (IGNORED) fprintf(stderr,"--- warning --- ");
423 +{ (IGNORED) fputs("--- warning --- ",stderr);
424 (IGNORED) fprintf(stderr,warn_err_mssg[n], str1,str2);
427 @@ -5772,8 +5772,8 @@
431 -{ (IGNORED) fprintf(stderr,"--- error --- ");
432 - (IGNORED) fprintf(stderr, warn_err_mssg[n]);
433 +{ (IGNORED) fputs("--- error --- ",stderr);
434 + (IGNORED) fputs(warn_err_mssg[n], stderr);
438 @@ -5794,7 +5794,7 @@
442 -{ (IGNORED) fprintf(stderr,"--- error --- ");
443 +{ (IGNORED) fputs("--- error --- ",stderr);
444 (IGNORED) fprintf(stderr, warn_err_mssg[n], i);
447 @@ -5820,7 +5820,7 @@
451 -{ (IGNORED) fprintf(stderr,"--- error --- ");
452 +{ (IGNORED) fputs("--- error --- ",stderr);
453 (IGNORED) fprintf(stderr, warn_err_mssg[n], str);
456 @@ -8762,7 +8762,7 @@
457 if( no_root_file ){ open_o_file(); }
460 - (IGNORED) fprintf(cur_o_file, end_span[0]);
461 + (IGNORED) fputs(end_span[0], cur_o_file);
465 @@ -8772,7 +8772,7 @@
468 if( i_accent_template ){
469 - (IGNORED) fprintf(cur_o_file, i_accent_second); }
470 + (IGNORED) fputs(i_accent_second, cur_o_file); }
471 needs_end_accent = (needs_accent_sym == 2 * TRUE);
472 if( needs_end_accent && t_accent_template )
474 @@ -8825,7 +8825,7 @@
477 if( i_accent_template ){
478 - (IGNORED) fprintf(cur_o_file, i_accent_first); }
479 + (IGNORED) fputs(i_accent_first, cur_o_file); }
483 @@ -9149,11 +9149,11 @@
484 if( no_root_file ){ open_o_file(); }
487 - (IGNORED) fprintf(cur_o_file, end_span[0]);
488 + (IGNORED) fputs(end_span[0], cur_o_file);
492 - (IGNORED) fprintf(cur_o_file, t_accent_fifth);
493 + (IGNORED) fputs(t_accent_fifth, cur_o_file);
494 needs_end_accent = FALSE;
495 needs_accented_sym--;
497 @@ -10397,7 +10397,7 @@
500 if( dim_on ){ (IGNORED) fprintf(cur_o_file, p, dim); }
501 - else { (IGNORED) fprintf(cur_o_file, p); }
502 + else { (IGNORED) fputs(p, cur_o_file); }
506 @@ -12232,7 +12232,7 @@
510 - (IGNORED) fprintf(log_file, begin_char_gif);
511 + (IGNORED) fputs(begin_char_gif, log_file);
513 for( cur_fnt = font_tbl_size; cur_fnt--; ){
515 --- texlive-20080816-source/texk/tex4htk/t4ht.c~ 2008-05-10 02:31:48.000000000 +0200
516 +++ texlive-20080816-source/texk/tex4htk/t4ht.c 2012-12-05 14:15:13.328338752 +0100
517 @@ -1048,8 +1048,8 @@
521 -{ (IGNORED) fprintf(stderr,"--- error --- ");
522 - (IGNORED) fprintf(stderr, warn_err_mssg[n]);
523 +{ (IGNORED) fputs("--- error --- ",stderr);
524 + (IGNORED) fputs( warn_err_mssg[n],stderr);
528 @@ -1069,8 +1069,8 @@
532 -{ (IGNORED) fprintf(stderr,"--- error --- ");
533 - (IGNORED) fprintf(stderr, warn_err_mssg[n]);
534 +{ (IGNORED) fputs("--- error --- ",stderr);
535 + (IGNORED) fputs( warn_err_mssg[n],stderr);
539 @@ -1094,7 +1094,7 @@
543 -{ (IGNORED) fprintf(stderr,"--- warning --- ");
544 +{ (IGNORED) fputs("--- warning --- ",stderr);
545 (IGNORED) fprintf(stderr,warn_err_mssg[n], str);
548 @@ -2804,7 +2804,7 @@
549 (IGNORED) fprintf(css_file, "font-size:%d%c;", second, '%');
552 - (IGNORED) fprintf(css_file, font_sty->body);
553 + (IGNORED) fputs( font_sty->body,css_file);
555 (IGNORED) fprintf(css_file, "}\n");
557 @@ -2823,7 +2823,7 @@
559 (IGNORED) fprintf(css_file, "{");
561 - (IGNORED) fprintf(css_file, font_sty->body);
562 + (IGNORED) fputs( font_sty->body,css_file);
564 (IGNORED) fprintf(css_file, "}}\n");
566 @@ -2846,7 +2846,7 @@
567 (IGNORED) fprintf(css_file, "font-size:%d%c;", second, '%');
570 - (IGNORED) fprintf(css_file, font_sty->body);
571 + (IGNORED) fputs( font_sty->body,css_file);
573 (IGNORED) fprintf(css_file, "}\n");
575 --- texlive-20080816-source/texk/xdvik/gui/message-window.c~ 2008-07-01 17:42:36.000000000 +0200
576 +++ texlive-20080816-source/texk/xdvik/gui/message-window.c 2012-12-05 14:16:52.958335241 +0100
580 ASSERT(type < (sizeof my_msg_map / sizeof my_msg_map[0]), "too few elements in my_msg_map");
581 - sprintf(win_title, my_msg_map[type].window_title);
582 + sprintf(win_title, "%s", my_msg_map[type].window_title);
585 fprintf(stderr, "internal_popup_window called with prompt: \"%s\"\n", msg_buf);
586 @@ -716,11 +716,10 @@
587 supposed to be printf-format strings (i.e. with doubled `%' to escape them)
589 fprintf(stderr, "\n%s:\n", my_msg_map[type].window_title);
590 - fprintf(stderr, msg_buf);
591 - fprintf(stderr, "\n");
592 + fprintf(stderr, "%s\n", msg_buf);
594 fprintf(stderr, "---------- helptext ----------\n");
595 - fprintf(stderr, helptext);
596 + fprintf(stderr, "%s", helptext);
597 fprintf(stderr, "\n---------- end of helptext ----------\n");
601 if (my_popup_num == MAX_POPUPS) {
602 /* already enough popups on screen, just dump it to stderr */
603 fprintf(stderr, "%s: ", win_title);
604 - fprintf(stderr, msg_buf);
605 - fputc('\n', stderr);
606 + fprintf(stderr, "%s\n", msg_buf);
607 /* Note: If a mad function continues to open popups, this will
608 * stop after MAX_POPUPS, but open a new window for each
609 * window the user pops down. Maybe we ought to do something