From 8370a7b050355f89199feb113906e9d18bd86125 Mon Sep 17 00:00:00 2001 From: Josh Coalson Date: Sat, 25 Sep 2004 23:46:26 +0000 Subject: [PATCH] un-inline iterator functions --- src/plugin_common/canonical_tag.c | 24 ++++++++++++++++++++++++ src/plugin_common/canonical_tag.h | 25 +++++-------------------- 2 files changed, 29 insertions(+), 20 deletions(-) diff --git a/src/plugin_common/canonical_tag.c b/src/plugin_common/canonical_tag.c index 7195119c..65a1f426 100644 --- a/src/plugin_common/canonical_tag.c +++ b/src/plugin_common/canonical_tag.c @@ -572,6 +572,30 @@ char *FLAC_plugin__canonical_get_formatted(FLAC__tag_iterator it) return NULL; } +/* + * enumeration + */ +unsigned FLAC_plugin__canonical_get_count(FLAC_Plugin__CanonicalTag *tag) +{ + return tag->count; +} +FLAC__tag_iterator FLAC_plugin__canonical_first(FLAC_Plugin__CanonicalTag *tag) +{ + return tag->head; +} +FLAC__tag_iterator FLAC_plugin__canonical_next(FLAC__tag_iterator it) +{ + return it->next; +} +wchar_t *FLAC_plugin__canonical_get_name(FLAC__tag_iterator it) +{ + return it->name; +} +wchar_t *FLAC_plugin__canonical_get_value(FLAC__tag_iterator it) +{ + return it->value; +} + /* * merging */ diff --git a/src/plugin_common/canonical_tag.h b/src/plugin_common/canonical_tag.h index 3133c5a7..5aa6bab3 100644 --- a/src/plugin_common/canonical_tag.h +++ b/src/plugin_common/canonical_tag.h @@ -70,26 +70,11 @@ FLAC__bool FLAC_plugin__canonical_remove(FLAC_Plugin__CanonicalTag *tag, const w void FLAC_plugin__canonical_remove_all(FLAC_Plugin__CanonicalTag *tag, const wchar_t *name); /* enumeration */ -static __inline unsigned FLAC_plugin__canonical_get_count(FLAC_Plugin__CanonicalTag *tag) -{ - return tag->count; -} -static __inline FLAC__tag_iterator FLAC_plugin__canonical_first(FLAC_Plugin__CanonicalTag *tag) -{ - return tag->head; -} -static __inline FLAC__tag_iterator FLAC_plugin__canonical_next(FLAC__tag_iterator it) -{ - return it->next; -} -static __inline wchar_t *FLAC_plugin__canonical_get_name(FLAC__tag_iterator it) -{ - return it->name; -} -static __inline wchar_t *FLAC_plugin__canonical_get_value(FLAC__tag_iterator it) -{ - return it->value; -} +unsigned FLAC_plugin__canonical_get_count(FLAC_Plugin__CanonicalTag *tag); +FLAC__tag_iterator FLAC_plugin__canonical_first(FLAC_Plugin__CanonicalTag *tag); +FLAC__tag_iterator FLAC_plugin__canonical_next(FLAC__tag_iterator it); +wchar_t *FLAC_plugin__canonical_get_name(FLAC__tag_iterator it); +wchar_t *FLAC_plugin__canonical_get_value(FLAC__tag_iterator it); /* returns a new string containing the current entry in UTF-8 in "NAME=VALUE" form */ char *FLAC_plugin__canonical_get_formatted(FLAC__tag_iterator it);