diff options
author | Jörg Mayer <jmayer@loplof.de> | 2005-07-23 06:21:17 +0000 |
---|---|---|
committer | Jörg Mayer <jmayer@loplof.de> | 2005-07-23 06:21:17 +0000 |
commit | fc4a2ddfe0a4d3fce5cd6d669b57d4532f079bca (patch) | |
tree | 1913b3b542aaf759544ed6036e61a9b982627af9 | |
parent | 23486b484eb30a15964afed958f11f38a8827a1c (diff) |
Move declaration of void ftype_register_* to ftypes-int.h.
This fixes some warnings like
ftype-bytes.c:52: warning: no previous declaration for 'bytes_fvalue_free'
svn path=/trunk/; revision=15010
-rw-r--r-- | epan/ftypes/ftype-bytes.c | 2 | ||||
-rw-r--r-- | epan/ftypes/ftypes-int.h | 14 | ||||
-rw-r--r-- | epan/ftypes/ftypes.c | 14 |
3 files changed, 15 insertions, 15 deletions
diff --git a/epan/ftypes/ftype-bytes.c b/epan/ftypes/ftype-bytes.c index 867c1008b1..72857de0b2 100644 --- a/epan/ftypes/ftype-bytes.c +++ b/epan/ftypes/ftype-bytes.c @@ -47,7 +47,7 @@ bytes_fvalue_new(fvalue_t *fv) fv->value.bytes = NULL; } -void +static void bytes_fvalue_free(fvalue_t *fv) { if (fv->value.bytes) { diff --git a/epan/ftypes/ftypes-int.h b/epan/ftypes/ftypes-int.h index 3f0411c7f0..c6928b535e 100644 --- a/epan/ftypes/ftypes-int.h +++ b/epan/ftypes/ftypes-int.h @@ -43,4 +43,18 @@ struct _pcre_tuple_t { void ftype_register(enum ftenum ftype, ftype_t *ft); +/* These are the ftype registration functions that need to be called. + * This list and the initialization function could be produced + * via a script, like the dissector registration, but there's so few + * that I don't mind doing it by hand for now. */ +void ftype_register_bytes(void); +void ftype_register_double(void); +void ftype_register_integers(void); +void ftype_register_ipv4(void); +void ftype_register_none(void); +void ftype_register_string(void); +void ftype_register_time(void); +void ftype_register_tvbuff(void); +void ftype_register_pcre(void); + #endif diff --git a/epan/ftypes/ftypes.c b/epan/ftypes/ftypes.c index e4472137aa..154ffe802d 100644 --- a/epan/ftypes/ftypes.c +++ b/epan/ftypes/ftypes.c @@ -34,20 +34,6 @@ static ftype_t* type_list[FT_NUM_TYPES]; /* Space for quickly allocating/de-allocating fvalue_t's */ SLAB_FREE_LIST_DEFINE(fvalue_t) -/* These are the ftype registration functions that need to be called. - * This list and the initialization function could be produced - * via a script, like the dissector registration, but there's so few - * that I don't mind doing it by hand for now. */ -void ftype_register_bytes(void); -void ftype_register_double(void); -void ftype_register_integers(void); -void ftype_register_ipv4(void); -void ftype_register_none(void); -void ftype_register_string(void); -void ftype_register_time(void); -void ftype_register_tvbuff(void); -void ftype_register_pcre(void); - /* Initialize the ftype module. */ void ftypes_initialize(void) |