diff options
Diffstat (limited to 'epan')
| -rw-r--r-- | epan/dfilter/dfilter.c | 8 | ||||
| -rw-r--r-- | epan/dfilter/dfvm.c | 37 | ||||
| -rw-r--r-- | epan/dfilter/dfvm.h | 5 |
3 files changed, 23 insertions, 27 deletions
diff --git a/epan/dfilter/dfilter.c b/epan/dfilter/dfilter.c index 8c4aacbe7f..d0afc3eaed 100644 --- a/epan/dfilter/dfilter.c +++ b/epan/dfilter/dfilter.c @@ -1,5 +1,5 @@ /* - * $Id: dfilter.c,v 1.7 2002/01/21 07:37:37 guy Exp $ + * $Id: dfilter.c,v 1.8 2002/04/08 20:11:31 gram Exp $ * * Ethereal - Network traffic analyzer * By Gerald Combs <gerald@ethereal.com> @@ -40,7 +40,7 @@ /* Balanced tree of abbreviations and IDs */ -GTree *dfilter_tokens = NULL; +static GTree *dfilter_tokens = NULL; #define DFILTER_TOKEN_ID_OFFSET 1 @@ -48,7 +48,7 @@ GTree *dfilter_tokens = NULL; static int g_strcmp(gconstpointer a, gconstpointer b); /* Global error message space for dfilter_compile errors */ -gchar dfilter_error_msg_buf[1024]; +static gchar dfilter_error_msg_buf[1024]; gchar *dfilter_error_msg; /* NULL when no error resulted */ /* In proto.c */ @@ -61,7 +61,7 @@ void df_scanner_cleanup(void); int df_lex(void); /* Holds the singular instance of our Lemon parser object */ -void* ParserObj = NULL; +static void* ParserObj = NULL; void dfilter_fail(char *format, ...) diff --git a/epan/dfilter/dfvm.c b/epan/dfilter/dfvm.c index 02bf948a5c..24621c8730 100644 --- a/epan/dfilter/dfvm.c +++ b/epan/dfilter/dfvm.c @@ -1,5 +1,5 @@ /* - * $Id: dfvm.c,v 1.5 2001/12/18 19:09:06 gram Exp $ + * $Id: dfvm.c,v 1.6 2002/04/08 20:11:31 gram Exp $ * * Ethereal - Network traffic analyzer * By Gerald Combs <gerald@zing.org> @@ -40,6 +40,23 @@ dfvm_insn_new(dfvm_opcode_t op) return insn; } +static void +dfvm_value_free(dfvm_value_t *v) +{ + switch (v->type) { + case FVALUE: + fvalue_free(v->value.fvalue); + break; + case DRANGE: + drange_free(v->value.drange); + break; + default: + /* nothing */ + ; + } + g_free(v); +} + void dfvm_insn_free(dfvm_insn_t *insn) { @@ -56,7 +73,6 @@ dfvm_insn_free(dfvm_insn_t *insn) } - dfvm_value_t* dfvm_value_new(dfvm_value_type_t type) { @@ -67,23 +83,6 @@ dfvm_value_new(dfvm_value_type_t type) return v; } -void -dfvm_value_free(dfvm_value_t *v) -{ - switch (v->type) { - case FVALUE: - fvalue_free(v->value.fvalue); - break; - case DRANGE: - drange_free(v->value.drange); - break; - default: - /* nothing */ - ; - } - g_free(v); -} - void dfvm_dump(FILE *f, GPtrArray *insns) diff --git a/epan/dfilter/dfvm.h b/epan/dfilter/dfvm.h index 954027626c..414f486ddf 100644 --- a/epan/dfilter/dfvm.h +++ b/epan/dfilter/dfvm.h @@ -1,5 +1,5 @@ /* - * $Id: dfvm.h,v 1.4 2002/01/21 07:37:37 guy Exp $ + * $Id: dfvm.h,v 1.5 2002/04/08 20:11:31 gram Exp $ * * Ethereal - Network traffic analyzer * By Gerald Combs <gerald@ethereal.com> @@ -90,9 +90,6 @@ dfvm_value_t* dfvm_value_new(dfvm_value_type_t type); void -dfvm_value_free(dfvm_value_t *v); - -void dfvm_dump(FILE *f, GPtrArray *insns); gboolean |