"dfilter_prime_proto_tree()" doesn't modify the "dfilter_t" to which

it's handed a pointer, which means that "epan_dissect_prime_dfilter()"
doesn't do so either; make that argument a "const dfilter_t *" in both
cases.

svn path=/trunk/; revision=6239
This commit is contained in:
Guy Harris 2002-09-09 21:04:15 +00:00
parent 5e8ecbaf46
commit ac69a72fda
4 changed files with 8 additions and 10 deletions

View File

@ -1,5 +1,5 @@
/*
* $Id: dfilter.c,v 1.11 2002/08/28 20:40:55 jmayer Exp $
* $Id: dfilter.c,v 1.12 2002/09/09 21:04:15 guy Exp $
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
@ -297,7 +297,7 @@ dfilter_apply_edt(dfilter_t *df, epan_dissect_t* edt)
void
dfilter_prime_proto_tree(dfilter_t *df, proto_tree *tree)
dfilter_prime_proto_tree(const dfilter_t *df, proto_tree *tree)
{
int i;

View File

@ -1,5 +1,5 @@
/*
* $Id: dfilter.h,v 1.6 2002/08/28 20:40:55 jmayer Exp $
* $Id: dfilter.h,v 1.7 2002/09/09 21:04:15 guy Exp $
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
@ -78,7 +78,7 @@ dfilter_apply(dfilter_t *df, proto_tree *tree);
/* Prime a proto_tree using the fields/protocols used in a dfilter. */
void
dfilter_prime_proto_tree(dfilter_t *df, proto_tree *tree);
dfilter_prime_proto_tree(const dfilter_t *df, proto_tree *tree);
/* Print bytecode of dfilter to stdout */
void

View File

@ -1,9 +1,8 @@
/* epan.h
*
* $Id: epan.c,v 1.20 2002/09/04 09:40:29 sahlberg Exp $
* $Id: epan.c,v 1.21 2002/09/09 21:04:06 guy Exp $
*
* Ethereal Protocol Analyzer Library
*
*/
#ifdef HAVE_CONFIG_H
@ -120,7 +119,7 @@ epan_dissect_free(epan_dissect_t* edt)
}
void
epan_dissect_prime_dfilter(epan_dissect_t *edt, dfilter_t* dfcode)
epan_dissect_prime_dfilter(epan_dissect_t *edt, const dfilter_t* dfcode)
{
dfilter_prime_proto_tree(dfcode, edt->tree);
}

View File

@ -1,6 +1,6 @@
/* epan.h
*
* $Id: epan.h,v 1.13 2002/08/28 20:40:44 jmayer Exp $
* $Id: epan.h,v 1.14 2002/09/09 21:04:06 guy Exp $
*
* Ethereal Protocol Analyzer Library
*
@ -19,7 +19,6 @@
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
*
*/
#ifndef EPAN_H
@ -64,7 +63,7 @@ epan_dissect_run(epan_dissect_t *edt, void* pseudo_header,
const guint8* data, frame_data *fd, column_info *cinfo);
void
epan_dissect_prime_dfilter(epan_dissect_t *edt, dfilter_t*);
epan_dissect_prime_dfilter(epan_dissect_t *edt, const dfilter_t*);
void
epan_dissect_fill_in_columns(epan_dissect_t *edt);