Ethereal-cvs: [Ethereal-cvs] cvs commit: ethereal merge.h Makefile.common merge.c mergecap.c

Note: This archive is from the project's previous web site, ethereal.com. This list is no longer active.

From: ulfl@xxxxxxxxxxxx (Ulf Lamping)
Date: Fri, 18 Jun 2004 05:01:59 -0500 (CDT)
ulfl        2004/06/18 05:01:59 CDT

  Modified files:
    .                    Makefile.common merge.c mergecap.c 
  Added files:
    .                    merge.h 
  Log:
  merge: remove code duplication in merge.c and mergecap.c (put it in merge.c),
  and doing some more code cleanup
  
  Revision  Changes    Path
  1.48      +3 -1      ethereal/Makefile.common
  1.3       +80 -99    ethereal/merge.c
  1.21      +16 -351   ethereal/mergecap.c