Ethereal-cvs: Re: [ethereal-cvs] cvs commit: ethereal file.c tvbuff.c

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

From: Gilbert Ramirez <gram@xxxxxxxxxx>
Date: Mon, 11 Sep 2000 10:32:36 -0400
On Mon, Sep 11, 2000 at 07:43:46PM +0900, Richard Sharpe wrote:
> At 02:34 AM 9/11/00 -0500, Richard Sharpe wrote:
> >sharpe      2000/09/11 02:34:00 CDT
> >
> >  Modified files:
> >    .                    file.c tvbuff.c 
> >  Log:
> >  We have to free up the per-frame data when we rescan, because we have
> >  called packet_init_proto, which blows away the items the list points to.
> >  
> >  Revision  Changes    Path
> >  1.218     +10 -1     ethereal/file.c
> >  1.13      +2 -1      ethereal/tvbuff.c
> 
> Hmmm, something is wrong here ... I didn't think that there were any
> changes that I wanted to commit in tvbuff.c, but maybe there were.

`cvs diff -r 1.12 -r 1.13 tvbuff.c` shows your one-line change.

$ cvs diff -r 1.12 -r 1.13 tvbuff.c
Index: tvbuff.c
===================================================================
RCS file: /usr/local/cvsroot/ethereal/tvbuff.c,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- tvbuff.c	2000/09/08 09:54:20	1.12
+++ tvbuff.c	2000/09/11 07:33:56	1.13
@@ -9,7 +9,7 @@
  * 		the data of a backing tvbuff, or can be a composite of
  * 		other tvbuffs.
  *
- * $Id: tvbuff.c,v 1.12 2000/09/08 09:54:20 guy Exp $
+ * $Id: tvbuff.c,v 1.13 2000/09/11 07:33:56 sharpe Exp $
  *
  * Copyright (c) 2000 by Gilbert Ramirez <gram@xxxxxxxxxx>
  *
@@ -37,6 +37,7 @@
 
 #include "pint.h"
 #include "tvbuff.h"
+#include "packet.h"
 
 
 typedef struct {

It's needed right now, but I plan on moving format_text() out of
packet.c; when I do that, I'll remove the #include "packet.h"

--gilbert