diff options
Diffstat (limited to 'src/fs/test_fs_directory.c')
-rw-r--r-- | src/fs/test_fs_directory.c | 30 |
1 files changed, 10 insertions, 20 deletions
diff --git a/src/fs/test_fs_directory.c b/src/fs/test_fs_directory.c index d8a9c63b6..ac581bd6f 100644 --- a/src/fs/test_fs_directory.c +++ b/src/fs/test_fs_directory.c | |||
@@ -41,11 +41,9 @@ struct PCLS | |||
41 | }; | 41 | }; |
42 | 42 | ||
43 | static void | 43 | static void |
44 | processor (void *cls, | 44 | processor (void *cls, const char *filename, const struct GNUNET_FS_Uri *uri, |
45 | const char *filename, | 45 | const struct GNUNET_CONTAINER_MetaData *md, size_t length, |
46 | const struct GNUNET_FS_Uri *uri, | 46 | const void *data) |
47 | const struct GNUNET_CONTAINER_MetaData *md, | ||
48 | size_t length, const void *data) | ||
49 | { | 47 | { |
50 | struct PCLS *p = cls; | 48 | struct PCLS *p = cls; |
51 | int i; | 49 | int i; |
@@ -54,8 +52,7 @@ processor (void *cls, | |||
54 | return; /* ignore directory's meta data */ | 52 | return; /* ignore directory's meta data */ |
55 | for (i = 0; i < p->max; i++) | 53 | for (i = 0; i < p->max; i++) |
56 | { | 54 | { |
57 | if (GNUNET_CONTAINER_meta_data_test_equal (p->md[i], | 55 | if (GNUNET_CONTAINER_meta_data_test_equal (p->md[i], md) && |
58 | md) && | ||
59 | GNUNET_FS_uri_test_equal (p->uri[i], uri)) | 56 | GNUNET_FS_uri_test_equal (p->uri[i], uri)) |
60 | { | 57 | { |
61 | p->pos++; | 58 | p->pos++; |
@@ -88,17 +85,12 @@ testDirectory (unsigned int i) | |||
88 | uris = GNUNET_malloc (sizeof (struct GNUNET_FS_Uri *) * i); | 85 | uris = GNUNET_malloc (sizeof (struct GNUNET_FS_Uri *) * i); |
89 | mds = GNUNET_malloc (sizeof (struct GNUNET_CONTAINER_MetaData *) * i); | 86 | mds = GNUNET_malloc (sizeof (struct GNUNET_CONTAINER_MetaData *) * i); |
90 | meta = GNUNET_CONTAINER_meta_data_create (); | 87 | meta = GNUNET_CONTAINER_meta_data_create (); |
91 | GNUNET_CONTAINER_meta_data_insert (meta, | 88 | GNUNET_CONTAINER_meta_data_insert (meta, "<test>", EXTRACTOR_METATYPE_TITLE, |
92 | "<test>", | 89 | EXTRACTOR_METAFORMAT_UTF8, "text/plain", |
93 | EXTRACTOR_METATYPE_TITLE, | ||
94 | EXTRACTOR_METAFORMAT_UTF8, | ||
95 | "text/plain", | ||
96 | "A title", strlen ("A title") + 1); | 90 | "A title", strlen ("A title") + 1); |
97 | GNUNET_CONTAINER_meta_data_insert (meta, | 91 | GNUNET_CONTAINER_meta_data_insert (meta, "<test>", |
98 | "<test>", | ||
99 | EXTRACTOR_METATYPE_AUTHOR_NAME, | 92 | EXTRACTOR_METATYPE_AUTHOR_NAME, |
100 | EXTRACTOR_METAFORMAT_UTF8, | 93 | EXTRACTOR_METAFORMAT_UTF8, "text/plain", |
101 | "text/plain", | ||
102 | "An author", strlen ("An author") + 1); | 94 | "An author", strlen ("An author") + 1); |
103 | for (p = 0; p < i; p++) | 95 | for (p = 0; p < i; p++) |
104 | { | 96 | { |
@@ -106,14 +98,12 @@ testDirectory (unsigned int i) | |||
106 | for (q = 0; q <= p; q++) | 98 | for (q = 0; q <= p; q++) |
107 | { | 99 | { |
108 | GNUNET_snprintf (txt, sizeof (txt), "%u -- %u\n", p, q); | 100 | GNUNET_snprintf (txt, sizeof (txt), "%u -- %u\n", p, q); |
109 | GNUNET_CONTAINER_meta_data_insert (mds[p], | 101 | GNUNET_CONTAINER_meta_data_insert (mds[p], "<test>", |
110 | "<test>", | ||
111 | q % EXTRACTOR_metatype_get_max (), | 102 | q % EXTRACTOR_metatype_get_max (), |
112 | EXTRACTOR_METAFORMAT_UTF8, | 103 | EXTRACTOR_METAFORMAT_UTF8, |
113 | "text/plain", txt, strlen (txt) + 1); | 104 | "text/plain", txt, strlen (txt) + 1); |
114 | } | 105 | } |
115 | GNUNET_snprintf (uri, | 106 | GNUNET_snprintf (uri, sizeof (uri), |
116 | sizeof (uri), | ||
117 | "gnunet://fs/chk/C282GG70GKK41O4551011DO413KFBVTVMQG1OG30I0K4045N0G41HAPB82G680A02JRVVFO8URVRU2F159011DO41000000022RG820.RNVVVVOOLCLK065B5D04HTNVNSIB2AI022RG8200HSLK1CO1000ATQ98824DMA2032LIMG50CG0K057NVUVG200000H000004400000.%u", | 107 | "gnunet://fs/chk/C282GG70GKK41O4551011DO413KFBVTVMQG1OG30I0K4045N0G41HAPB82G680A02JRVVFO8URVRU2F159011DO41000000022RG820.RNVVVVOOLCLK065B5D04HTNVNSIB2AI022RG8200HSLK1CO1000ATQ98824DMA2032LIMG50CG0K057NVUVG200000H000004400000.%u", |
118 | p); | 108 | p); |
119 | emsg = NULL; | 109 | emsg = NULL; |