diff options
author | Christian Grothoff <christian@grothoff.org> | 2010-01-03 21:42:52 +0000 |
---|---|---|
committer | Christian Grothoff <christian@grothoff.org> | 2010-01-03 21:42:52 +0000 |
commit | 3c5249af8087b0b1a4f131a3e19a9759639ab5db (patch) | |
tree | 697ff622324a7d259dc59da63205f398661a56fa /src/fs/gnunet-directory.c | |
parent | ebd1325d27e2062f3fb8e92766178ab0660c2dac (diff) | |
download | gnunet-3c5249af8087b0b1a4f131a3e19a9759639ab5db.tar.gz gnunet-3c5249af8087b0b1a4f131a3e19a9759639ab5db.zip |
adapting main code base to work with libextractor 0.6 API; testcases will follow later
Diffstat (limited to 'src/fs/gnunet-directory.c')
-rw-r--r-- | src/fs/gnunet-directory.c | 21 |
1 files changed, 14 insertions, 7 deletions
diff --git a/src/fs/gnunet-directory.c b/src/fs/gnunet-directory.c index 6201c5dbb..3ea76985e 100644 --- a/src/fs/gnunet-directory.c +++ b/src/fs/gnunet-directory.c | |||
@@ -36,13 +36,20 @@ static int ret; | |||
36 | */ | 36 | */ |
37 | static int | 37 | static int |
38 | item_printer (void *cls, | 38 | item_printer (void *cls, |
39 | EXTRACTOR_KeywordType type, | 39 | const char *plugin_name, |
40 | const char *data) | 40 | enum EXTRACTOR_MetaType type, |
41 | enum EXTRACTOR_MetaFormat format, | ||
42 | const char *data_mime_type, | ||
43 | const char *data, | ||
44 | size_t data_size) | ||
41 | { | 45 | { |
46 | if ( (format != EXTRACTOR_METAFORMAT_UTF8) && | ||
47 | (format != EXTRACTOR_METAFORMAT_C_STRING) ) | ||
48 | return 0; | ||
42 | printf ("\t%20s: %s\n", | 49 | printf ("\t%20s: %s\n", |
43 | dgettext (LIBEXTRACTOR_GETTEXT_DOMAIN, | 50 | dgettext (LIBEXTRACTOR_GETTEXT_DOMAIN, |
44 | EXTRACTOR_getKeywordTypeAsString (type)), data); | 51 | EXTRACTOR_metatype_to_string (type)), data); |
45 | return GNUNET_OK; | 52 | return 0; |
46 | } | 53 | } |
47 | 54 | ||
48 | 55 | ||
@@ -75,9 +82,9 @@ print_entry (void *cls, | |||
75 | string = GNUNET_FS_uri_to_string (uri); | 82 | string = GNUNET_FS_uri_to_string (uri); |
76 | printf ("%s:\n", string); | 83 | printf ("%s:\n", string); |
77 | GNUNET_free (string); | 84 | GNUNET_free (string); |
78 | GNUNET_CONTAINER_meta_data_get_contents (meta, | 85 | GNUNET_CONTAINER_meta_data_iterate (meta, |
79 | &item_printer, | 86 | &item_printer, |
80 | NULL); | 87 | NULL); |
81 | } | 88 | } |
82 | 89 | ||
83 | 90 | ||