diff options
author | Christian Grothoff <christian@grothoff.org> | 2010-04-05 22:01:04 +0000 |
---|---|---|
committer | Christian Grothoff <christian@grothoff.org> | 2010-04-05 22:01:04 +0000 |
commit | b7969ceef5fa099b44e1f4b03cadbb0928abd4c5 (patch) | |
tree | 29144e37227f1c61391369536b4e156baeff961e /src/fs/test_fs_namespace.c | |
parent | a2590c8e4a226f70500c35612fd059e43527f8db (diff) | |
download | gnunet-b7969ceef5fa099b44e1f4b03cadbb0928abd4c5.tar.gz gnunet-b7969ceef5fa099b44e1f4b03cadbb0928abd4c5.zip |
be less verbose
Diffstat (limited to 'src/fs/test_fs_namespace.c')
-rw-r--r-- | src/fs/test_fs_namespace.c | 16 |
1 files changed, 1 insertions, 15 deletions
diff --git a/src/fs/test_fs_namespace.c b/src/fs/test_fs_namespace.c index 91306a64c..8e13b211d 100644 --- a/src/fs/test_fs_namespace.c +++ b/src/fs/test_fs_namespace.c | |||
@@ -143,8 +143,6 @@ progress_cb (void *cls, | |||
143 | case GNUNET_FS_STATUS_SEARCH_RESULT: | 143 | case GNUNET_FS_STATUS_SEARCH_RESULT: |
144 | if (sks_search == event->value.search.sc) | 144 | if (sks_search == event->value.search.sc) |
145 | { | 145 | { |
146 | fprintf (stderr, | ||
147 | "Search result for sks received\n"); | ||
148 | if (! GNUNET_FS_uri_test_equal (sks_expect_uri, | 146 | if (! GNUNET_FS_uri_test_equal (sks_expect_uri, |
149 | event->value.search.specifics.result.uri)) | 147 | event->value.search.specifics.result.uri)) |
150 | { | 148 | { |
@@ -160,8 +158,6 @@ progress_cb (void *cls, | |||
160 | } | 158 | } |
161 | else if (ksk_search == event->value.search.sc) | 159 | else if (ksk_search == event->value.search.sc) |
162 | { | 160 | { |
163 | fprintf (stderr, | ||
164 | "Search result for ksk received\n"); | ||
165 | if (! GNUNET_FS_uri_test_equal (ksk_expect_uri, | 161 | if (! GNUNET_FS_uri_test_equal (ksk_expect_uri, |
166 | event->value.search.specifics.result.uri)) | 162 | event->value.search.specifics.result.uri)) |
167 | { | 163 | { |
@@ -177,7 +173,7 @@ progress_cb (void *cls, | |||
177 | else | 173 | else |
178 | { | 174 | { |
179 | fprintf (stderr, | 175 | fprintf (stderr, |
180 | "Search result received!?\n"); | 176 | "Unexpected search result received!\n"); |
181 | GNUNET_break (0); | 177 | GNUNET_break (0); |
182 | } | 178 | } |
183 | break; | 179 | break; |
@@ -199,9 +195,6 @@ progress_cb (void *cls, | |||
199 | GNUNET_break (0); | 195 | GNUNET_break (0); |
200 | break; | 196 | break; |
201 | case GNUNET_FS_STATUS_SEARCH_START: | 197 | case GNUNET_FS_STATUS_SEARCH_START: |
202 | fprintf (stderr, | ||
203 | "Search start event for `%s' received\n", | ||
204 | (const char*) event->value.search.cctx); | ||
205 | GNUNET_assert ( (NULL == event->value.search.cctx) || | 198 | GNUNET_assert ( (NULL == event->value.search.cctx) || |
206 | (0 == strcmp ("sks_search", event->value.search.cctx)) || | 199 | (0 == strcmp ("sks_search", event->value.search.cctx)) || |
207 | (0 == strcmp ("ksk_search", event->value.search.cctx))); | 200 | (0 == strcmp ("ksk_search", event->value.search.cctx))); |
@@ -215,8 +208,6 @@ progress_cb (void *cls, | |||
215 | case GNUNET_FS_STATUS_SEARCH_RESULT_STOPPED: | 208 | case GNUNET_FS_STATUS_SEARCH_RESULT_STOPPED: |
216 | return NULL; | 209 | return NULL; |
217 | case GNUNET_FS_STATUS_SEARCH_STOPPED: | 210 | case GNUNET_FS_STATUS_SEARCH_STOPPED: |
218 | fprintf (stderr, | ||
219 | "Search stop event received\n"); | ||
220 | return NULL; | 211 | return NULL; |
221 | default: | 212 | default: |
222 | fprintf (stderr, | 213 | fprintf (stderr, |
@@ -262,9 +253,7 @@ publish_cont (void *cls, | |||
262 | GNUNET_free (msg); | 253 | GNUNET_free (msg); |
263 | return; | 254 | return; |
264 | } | 255 | } |
265 | fprintf (stderr, "Starting keyword search...\n"); | ||
266 | ksk_search = GNUNET_FS_search_start (fs, ksk_uri, 1, "ksk_search"); | 256 | ksk_search = GNUNET_FS_search_start (fs, ksk_uri, 1, "ksk_search"); |
267 | fprintf (stderr, "Starting namespace search...\n") ; | ||
268 | sks_search = GNUNET_FS_search_start (fs, sks_uri, 1, "sks_search"); | 257 | sks_search = GNUNET_FS_search_start (fs, sks_uri, 1, "sks_search"); |
269 | GNUNET_FS_uri_destroy (sks_uri); | 258 | GNUNET_FS_uri_destroy (sks_uri); |
270 | } | 259 | } |
@@ -285,7 +274,6 @@ sks_cont (void *cls, | |||
285 | msg = NULL; | 274 | msg = NULL; |
286 | ksk_uri = GNUNET_FS_uri_parse ("gnunet://fs/ksk/ns-search", &msg); | 275 | ksk_uri = GNUNET_FS_uri_parse ("gnunet://fs/ksk/ns-search", &msg); |
287 | GNUNET_assert (NULL == msg); | 276 | GNUNET_assert (NULL == msg); |
288 | fprintf (stderr, "Advertising update 'this' namespace entry under keyword...\n"); | ||
289 | ksk_expect_uri = GNUNET_FS_uri_dup (uri); | 277 | ksk_expect_uri = GNUNET_FS_uri_dup (uri); |
290 | GNUNET_FS_publish_ksk (fs, | 278 | GNUNET_FS_publish_ksk (fs, |
291 | ksk_uri, | 279 | ksk_uri, |
@@ -322,7 +310,6 @@ adv_cont (void *cls, | |||
322 | "testNamespace"); | 310 | "testNamespace"); |
323 | meta = GNUNET_CONTAINER_meta_data_create (); | 311 | meta = GNUNET_CONTAINER_meta_data_create (); |
324 | GNUNET_assert (NULL == emsg); | 312 | GNUNET_assert (NULL == emsg); |
325 | fprintf (stderr, "Advertising update 'this->next' namespace update...\n"); | ||
326 | sks_expect_uri = GNUNET_FS_uri_dup (uri); | 313 | sks_expect_uri = GNUNET_FS_uri_dup (uri); |
327 | GNUNET_FS_publish_sks (fs, | 314 | GNUNET_FS_publish_sks (fs, |
328 | ns, | 315 | ns, |
@@ -376,7 +363,6 @@ testNamespace () | |||
376 | err = 1; | 363 | err = 1; |
377 | return; | 364 | return; |
378 | } | 365 | } |
379 | fprintf (stderr, "Advertising namespace root...\n"); | ||
380 | expiration = GNUNET_TIME_relative_to_absolute (GNUNET_TIME_UNIT_MINUTES); | 366 | expiration = GNUNET_TIME_relative_to_absolute (GNUNET_TIME_UNIT_MINUTES); |
381 | meta = GNUNET_CONTAINER_meta_data_create (); | 367 | meta = GNUNET_CONTAINER_meta_data_create (); |
382 | ksk_uri = GNUNET_FS_uri_parse ("gnunet://fs/ksk/testnsa", NULL); | 368 | ksk_uri = GNUNET_FS_uri_parse ("gnunet://fs/ksk/testnsa", NULL); |