aboutsummaryrefslogtreecommitdiff
path: root/src/fs/fs_sharetree.c
diff options
context:
space:
mode:
Diffstat (limited to 'src/fs/fs_sharetree.c')
-rw-r--r--src/fs/fs_sharetree.c16
1 files changed, 8 insertions, 8 deletions
diff --git a/src/fs/fs_sharetree.c b/src/fs/fs_sharetree.c
index 954d450a7..c392ba1ef 100644
--- a/src/fs/fs_sharetree.c
+++ b/src/fs/fs_sharetree.c
@@ -174,7 +174,7 @@ add_to_keyword_counter (void *cls, const char *keyword, int is_mandatory)
174 cnt->value = (const char *) &cnt[1]; 174 cnt->value = (const char *) &cnt[1];
175 memcpy (&cnt[1], keyword, klen); 175 memcpy (&cnt[1], keyword, klen);
176 GNUNET_assert (GNUNET_OK == 176 GNUNET_assert (GNUNET_OK ==
177 GNUNET_CONTAINER_multihashmap_put (mcm, 177 GNUNET_CONTAINER_multihashmap_put (mcm,
178 &hc, cnt, 178 &hc, cnt,
179 GNUNET_CONTAINER_MULTIHASHMAPOPTION_UNIQUE_ONLY)); 179 GNUNET_CONTAINER_MULTIHASHMAPOPTION_UNIQUE_ONLY));
180 } 180 }
@@ -313,7 +313,7 @@ migrate_and_drop_metadata (void *cls, const struct GNUNET_HashCode * key, void *
313 counter->type, 313 counter->type,
314 counter->format, 314 counter->format,
315 counter->data_mime_type, counter->data, 315 counter->data_mime_type, counter->data,
316 counter->data_size); 316 counter->data_size);
317 } 317 }
318 GNUNET_assert (GNUNET_YES == 318 GNUNET_assert (GNUNET_YES ==
319 GNUNET_CONTAINER_multihashmap_remove (tc->metacounter, 319 GNUNET_CONTAINER_multihashmap_remove (tc->metacounter,
@@ -350,7 +350,7 @@ share_tree_trim (struct TrimContext *tc,
350 if (tree->is_directory == GNUNET_YES) 350 if (tree->is_directory == GNUNET_YES)
351 { 351 {
352 const char *user = getenv ("USER"); 352 const char *user = getenv ("USER");
353 if ( (user == NULL) || 353 if ( (user == NULL) ||
354 (0 != strncasecmp (user, tree->short_filename, strlen(user)))) 354 (0 != strncasecmp (user, tree->short_filename, strlen(user))))
355 { 355 {
356 /* only use filename if it doesn't match $USER */ 356 /* only use filename if it doesn't match $USER */
@@ -366,12 +366,12 @@ share_tree_trim (struct TrimContext *tc,
366 366
367 if (1 >= num_children) 367 if (1 >= num_children)
368 return; /* nothing to trim */ 368 return; /* nothing to trim */
369 369
370 /* now, count keywords and meta data in children */ 370 /* now, count keywords and meta data in children */
371 for (pos = tree->children_head; NULL != pos; pos = pos->next) 371 for (pos = tree->children_head; NULL != pos; pos = pos->next)
372 { 372 {
373 if (NULL != pos->meta) 373 if (NULL != pos->meta)
374 GNUNET_CONTAINER_meta_data_iterate (pos->meta, &add_to_meta_counter, tc->metacounter); 374 GNUNET_CONTAINER_meta_data_iterate (pos->meta, &add_to_meta_counter, tc->metacounter);
375 if (NULL != pos->ksk_uri) 375 if (NULL != pos->ksk_uri)
376 GNUNET_FS_uri_ksk_get_keywords (pos->ksk_uri, &add_to_keyword_counter, tc->keywordcounter); 376 GNUNET_FS_uri_ksk_get_keywords (pos->ksk_uri, &add_to_keyword_counter, tc->keywordcounter);
377 } 377 }
@@ -393,10 +393,10 @@ share_tree_trim (struct TrimContext *tc,
393 393
394 /* add high-frequency meta data and keywords to parent */ 394 /* add high-frequency meta data and keywords to parent */
395 tc->pos = tree; 395 tc->pos = tree;
396 GNUNET_CONTAINER_multihashmap_iterate (tc->keywordcounter, 396 GNUNET_CONTAINER_multihashmap_iterate (tc->keywordcounter,
397 &migrate_and_drop_keywords, 397 &migrate_and_drop_keywords,
398 tc); 398 tc);
399 GNUNET_CONTAINER_multihashmap_iterate (tc->metacounter, 399 GNUNET_CONTAINER_multihashmap_iterate (tc->metacounter,
400 &migrate_and_drop_metadata, 400 &migrate_and_drop_metadata,
401 tc); 401 tc);
402} 402}
@@ -414,7 +414,7 @@ GNUNET_FS_share_tree_trim (struct GNUNET_FS_ShareTreeItem *toplevel)
414 struct TrimContext tc; 414 struct TrimContext tc;
415 415
416 if (toplevel == NULL) 416 if (toplevel == NULL)
417 return; 417 return;
418 tc.keywordcounter = GNUNET_CONTAINER_multihashmap_create (1024, GNUNET_NO); 418 tc.keywordcounter = GNUNET_CONTAINER_multihashmap_create (1024, GNUNET_NO);
419 tc.metacounter = GNUNET_CONTAINER_multihashmap_create (1024, GNUNET_NO); 419 tc.metacounter = GNUNET_CONTAINER_multihashmap_create (1024, GNUNET_NO);
420 share_tree_trim (&tc, toplevel); 420 share_tree_trim (&tc, toplevel);