| 11998-08-06 David Masterson of kla-tencor.com 2 3 * util.c (flush_output): Don't prototype. 4 5Thu Jul 2 16:34:38 1998 Ian Lance Taylor <ian@cygnus.com> 6 7 Simplify the callback interface: 8 * diffrun.h: Don't include <stdarg.h> or <varargs.h>. 9 (struct diff_callbacks): Remove printf_output field. 10 * util.c: Include <stdarg.h> or <varargs.h>. 11 (printf_output): Use vasprintf and write_output callback rather 12 than printf_output callback. 13 * diff3.c (read_diff): Don't set my_callbacks.printf_output. 14 15Thu Jun 18 12:43:53 1998 Ian Lance Taylor <ian@cygnus.com> 16 17 * diffrun.h: New file. 18 * diff.h: Include diffrun.h. 19 (callbacks): New EXTERN variable. 20 (write_output, printf_output, flush_output): Declare. 21 * diff.c (diff_run): Add parameter callbacks_arg. Use callback 22 functions rather than writing to stdout. Don't open a file if 23 there is a write_output callback. Call perror_with_name rather 24 than perror. 25 (usage): Use callbacks if defined rather than writing to stdout. 26 (compare_files): Call flush_output rather than fflush (outfile). 27 * diff3.c: Include diffrun.h. Change several functions to use 28 output functions from util.c rather than direct printing. Use 29 diff_error and friends rather than printing to stderr. Set global 30 variable outfile. 31 (outfile, callbacks): Declare. 32 (write_output, printf_output, flush_output): Declare. 33 (diff3_run): Add parameter callbacks_arg. Use callback functions 34 rather than writing to stdout. 35 (usage): Use callbacks if defined rather than writing to stdout. 36 (read_diff): Preserve callbacks and outfile around call to 37 diff_run. 38 * util.c (perror_with_name): Use error callback if defined. 39 (pfatal_with_name, diff_error): Likewise. 40 (message5): Use printf_output and write_output. 41 (print_message_queue, print_1_line, output_1_line): Likewise. 42 (begin_output): Reject paginate_flag if there are output 43 callbacks. 44 (write_output, printf_output, flush_output): New functions. 45 * context.c: Change all output to outfile to use printf_output and 46 write_output. 47 * ed.c: Likewise. 48 * ifdef.c: Likewise. 49 * normal.c: Likewise. 50 * side.c: Likewise. 51 * Makefile.in (SOURCES): Add diffrun.h. 52 ($(OBJECTS)): Depend upon diffrun.h. 53
|
1Fri Jan 16 14:58:19 1998 Larry Jones <larry.jones@sdrc.com> 2 3 * diff.c, diff3.c: Plug memory leaks. 4 5Thu Jan 15 13:36:46 1998 Jim Kingdon <kingdon@harvey.cyclic.com> 6 7 * Makefile.in (installdirs): New rule, for when ../Makefile 8 recurses into this directory (bug reported by W. L. Estes).
--- 194 unchanged lines hidden --- | 54Fri Jan 16 14:58:19 1998 Larry Jones <larry.jones@sdrc.com> 55 56 * diff.c, diff3.c: Plug memory leaks. 57 58Thu Jan 15 13:36:46 1998 Jim Kingdon <kingdon@harvey.cyclic.com> 59 60 * Makefile.in (installdirs): New rule, for when ../Makefile 61 recurses into this directory (bug reported by W. L. Estes).
--- 194 unchanged lines hidden --- |