diff options
Diffstat (limited to 'src/fs')
-rw-r--r-- | src/fs/fs_api.c | 10 | ||||
-rw-r--r-- | src/fs/fs_directory.c | 2 | ||||
-rw-r--r-- | src/fs/fs_dirmetascan.c | 2 | ||||
-rw-r--r-- | src/fs/fs_download.c | 2 | ||||
-rw-r--r-- | src/fs/fs_file_information.c | 4 | ||||
-rw-r--r-- | src/fs/fs_getopt.c | 2 | ||||
-rw-r--r-- | src/fs/fs_list_indexed.c | 2 | ||||
-rw-r--r-- | src/fs/fs_test_lib.c | 4 | ||||
-rw-r--r-- | src/fs/fs_tree.c | 4 | ||||
-rw-r--r-- | src/fs/fs_unindex.c | 2 | ||||
-rw-r--r-- | src/fs/gnunet-auto-share.c | 4 | ||||
-rw-r--r-- | src/fs/gnunet-helper-fs-publish.c | 2 | ||||
-rw-r--r-- | src/fs/gnunet-service-fs_pr.c | 4 | ||||
-rw-r--r-- | src/fs/perf_gnunet_service_fs_p2p.c | 2 | ||||
-rw-r--r-- | src/fs/perf_gnunet_service_fs_p2p_respect.c | 2 | ||||
-rw-r--r-- | src/fs/test_gnunet_service_fs_migration.c | 2 |
16 files changed, 25 insertions, 25 deletions
diff --git a/src/fs/fs_api.c b/src/fs/fs_api.c index 72d5eab15..3b8d125ad 100644 --- a/src/fs/fs_api.c +++ b/src/fs/fs_api.c | |||
@@ -371,7 +371,7 @@ GNUNET_FS_make_top (struct GNUNET_FS_Handle *h, SuspendSignalFunction ssf, | |||
371 | { | 371 | { |
372 | struct TopLevelActivity *ret; | 372 | struct TopLevelActivity *ret; |
373 | 373 | ||
374 | ret = GNUNET_malloc (sizeof (struct TopLevelActivity)); | 374 | ret = GNUNET_new (struct TopLevelActivity); |
375 | ret->ssf = ssf; | 375 | ret->ssf = ssf; |
376 | ret->ssf_cls = ssf_cls; | 376 | ret->ssf_cls = ssf_cls; |
377 | GNUNET_CONTAINER_DLL_insert (h->top_head, h->top_tail, ret); | 377 | GNUNET_CONTAINER_DLL_insert (h->top_head, h->top_tail, ret); |
@@ -852,7 +852,7 @@ deserialize_fi_node (struct GNUNET_FS_Handle *h, const char *fn, | |||
852 | GNUNET_break (0); | 852 | GNUNET_break (0); |
853 | return NULL; | 853 | return NULL; |
854 | } | 854 | } |
855 | ret = GNUNET_malloc (sizeof (struct GNUNET_FS_FileInformation)); | 855 | ret = GNUNET_new (struct GNUNET_FS_FileInformation); |
856 | ret->h = h; | 856 | ret->h = h; |
857 | ksks = NULL; | 857 | ksks = NULL; |
858 | chks = NULL; | 858 | chks = NULL; |
@@ -1769,7 +1769,7 @@ read_download_request (struct GNUNET_BIO_ReadHandle *rh) | |||
1769 | struct DownloadRequest *dr; | 1769 | struct DownloadRequest *dr; |
1770 | unsigned int i; | 1770 | unsigned int i; |
1771 | 1771 | ||
1772 | dr = GNUNET_malloc (sizeof (struct DownloadRequest)); | 1772 | dr = GNUNET_new (struct DownloadRequest); |
1773 | if ((GNUNET_OK != GNUNET_BIO_read_int32 (rh, &dr->state)) || | 1773 | if ((GNUNET_OK != GNUNET_BIO_read_int32 (rh, &dr->state)) || |
1774 | (GNUNET_OK != GNUNET_BIO_read_int64 (rh, &dr->offset)) || | 1774 | (GNUNET_OK != GNUNET_BIO_read_int64 (rh, &dr->offset)) || |
1775 | (GNUNET_OK != GNUNET_BIO_read_int32 (rh, &dr->num_children)) || | 1775 | (GNUNET_OK != GNUNET_BIO_read_int32 (rh, &dr->num_children)) || |
@@ -2127,7 +2127,7 @@ deserialize_unindex_file (void *cls, const char *filename) | |||
2127 | char *uris; | 2127 | char *uris; |
2128 | uint32_t state; | 2128 | uint32_t state; |
2129 | 2129 | ||
2130 | uc = GNUNET_malloc (sizeof (struct GNUNET_FS_UnindexContext)); | 2130 | uc = GNUNET_new (struct GNUNET_FS_UnindexContext); |
2131 | uc->h = h; | 2131 | uc->h = h; |
2132 | uc->serialization = get_serialization_short_name (filename); | 2132 | uc->serialization = get_serialization_short_name (filename); |
2133 | rh = GNUNET_BIO_read_open (filename); | 2133 | rh = GNUNET_BIO_read_open (filename); |
@@ -2994,7 +2994,7 @@ GNUNET_FS_start (const struct GNUNET_CONFIGURATION_Handle *cfg, | |||
2994 | enum GNUNET_FS_OPTIONS opt; | 2994 | enum GNUNET_FS_OPTIONS opt; |
2995 | va_list ap; | 2995 | va_list ap; |
2996 | 2996 | ||
2997 | ret = GNUNET_malloc (sizeof (struct GNUNET_FS_Handle)); | 2997 | ret = GNUNET_new (struct GNUNET_FS_Handle); |
2998 | ret->cfg = cfg; | 2998 | ret->cfg = cfg; |
2999 | ret->client_name = GNUNET_strdup (client_name); | 2999 | ret->client_name = GNUNET_strdup (client_name); |
3000 | ret->upcb = upcb; | 3000 | ret->upcb = upcb; |
diff --git a/src/fs/fs_directory.c b/src/fs/fs_directory.c index b26ec12d3..3f7cc45c1 100644 --- a/src/fs/fs_directory.c +++ b/src/fs/fs_directory.c | |||
@@ -346,7 +346,7 @@ GNUNET_FS_directory_builder_create (const struct GNUNET_CONTAINER_MetaData | |||
346 | { | 346 | { |
347 | struct GNUNET_FS_DirectoryBuilder *ret; | 347 | struct GNUNET_FS_DirectoryBuilder *ret; |
348 | 348 | ||
349 | ret = GNUNET_malloc (sizeof (struct GNUNET_FS_DirectoryBuilder)); | 349 | ret = GNUNET_new (struct GNUNET_FS_DirectoryBuilder); |
350 | if (mdir != NULL) | 350 | if (mdir != NULL) |
351 | ret->meta = GNUNET_CONTAINER_meta_data_duplicate (mdir); | 351 | ret->meta = GNUNET_CONTAINER_meta_data_duplicate (mdir); |
352 | else | 352 | else |
diff --git a/src/fs/fs_dirmetascan.c b/src/fs/fs_dirmetascan.c index 3b3615f65..83e436b16 100644 --- a/src/fs/fs_dirmetascan.c +++ b/src/fs/fs_dirmetascan.c | |||
@@ -463,7 +463,7 @@ GNUNET_FS_directory_scan_start (const char *filename, | |||
463 | GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, | 463 | GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, |
464 | "Starting to scan directory `%s'\n", | 464 | "Starting to scan directory `%s'\n", |
465 | filename_expanded); | 465 | filename_expanded); |
466 | ds = GNUNET_malloc (sizeof (struct GNUNET_FS_DirScanner)); | 466 | ds = GNUNET_new (struct GNUNET_FS_DirScanner); |
467 | ds->progress_callback = cb; | 467 | ds->progress_callback = cb; |
468 | ds->progress_callback_cls = cb_cls; | 468 | ds->progress_callback_cls = cb_cls; |
469 | ds->filename_expanded = filename_expanded; | 469 | ds->filename_expanded = filename_expanded; |
diff --git a/src/fs/fs_download.c b/src/fs/fs_download.c index f9f5c0a06..5d4c6d899 100644 --- a/src/fs/fs_download.c +++ b/src/fs/fs_download.c | |||
@@ -1550,7 +1550,7 @@ create_download_request (struct DownloadRequest *parent, | |||
1550 | unsigned int head_skip; | 1550 | unsigned int head_skip; |
1551 | uint64_t child_block_size; | 1551 | uint64_t child_block_size; |
1552 | 1552 | ||
1553 | dr = GNUNET_malloc (sizeof (struct DownloadRequest)); | 1553 | dr = GNUNET_new (struct DownloadRequest); |
1554 | dr->parent = parent; | 1554 | dr->parent = parent; |
1555 | dr->depth = depth; | 1555 | dr->depth = depth; |
1556 | dr->offset = dr_offset; | 1556 | dr->offset = dr_offset; |
diff --git a/src/fs/fs_file_information.c b/src/fs/fs_file_information.c index 87d618b07..d369598ef 100644 --- a/src/fs/fs_file_information.c +++ b/src/fs/fs_file_information.c | |||
@@ -241,7 +241,7 @@ GNUNET_FS_file_information_create_from_reader (struct GNUNET_FS_Handle *h, | |||
241 | GNUNET_break (0); | 241 | GNUNET_break (0); |
242 | return NULL; | 242 | return NULL; |
243 | } | 243 | } |
244 | ret = GNUNET_malloc (sizeof (struct GNUNET_FS_FileInformation)); | 244 | ret = GNUNET_new (struct GNUNET_FS_FileInformation); |
245 | ret->h = h; | 245 | ret->h = h; |
246 | ret->client_info = client_info; | 246 | ret->client_info = client_info; |
247 | ret->meta = GNUNET_CONTAINER_meta_data_duplicate (meta); | 247 | ret->meta = GNUNET_CONTAINER_meta_data_duplicate (meta); |
@@ -297,7 +297,7 @@ GNUNET_FS_file_information_create_empty_directory (struct GNUNET_FS_Handle *h, | |||
297 | { | 297 | { |
298 | struct GNUNET_FS_FileInformation *ret; | 298 | struct GNUNET_FS_FileInformation *ret; |
299 | 299 | ||
300 | ret = GNUNET_malloc (sizeof (struct GNUNET_FS_FileInformation)); | 300 | ret = GNUNET_new (struct GNUNET_FS_FileInformation); |
301 | ret->h = h; | 301 | ret->h = h; |
302 | ret->client_info = client_info; | 302 | ret->client_info = client_info; |
303 | ret->meta = GNUNET_CONTAINER_meta_data_duplicate (meta); | 303 | ret->meta = GNUNET_CONTAINER_meta_data_duplicate (meta); |
diff --git a/src/fs/fs_getopt.c b/src/fs/fs_getopt.c index d7ff97c6b..5e9510956 100644 --- a/src/fs/fs_getopt.c +++ b/src/fs/fs_getopt.c | |||
@@ -53,7 +53,7 @@ GNUNET_FS_getopt_set_keywords (struct GNUNET_GETOPT_CommandLineProcessorContext | |||
53 | 53 | ||
54 | if (u == NULL) | 54 | if (u == NULL) |
55 | { | 55 | { |
56 | u = GNUNET_malloc (sizeof (struct GNUNET_FS_Uri)); | 56 | u = GNUNET_new (struct GNUNET_FS_Uri); |
57 | *uri = u; | 57 | *uri = u; |
58 | u->type = GNUNET_FS_URI_KSK; | 58 | u->type = GNUNET_FS_URI_KSK; |
59 | u->data.ksk.keywordCount = 0; | 59 | u->data.ksk.keywordCount = 0; |
diff --git a/src/fs/fs_list_indexed.c b/src/fs/fs_list_indexed.c index ef03dee76..7a891155e 100644 --- a/src/fs/fs_list_indexed.c +++ b/src/fs/fs_list_indexed.c | |||
@@ -151,7 +151,7 @@ GNUNET_FS_get_indexed_files (struct GNUNET_FS_Handle *h, | |||
151 | _("Failed to not connect to `%s' service.\n"), "fs"); | 151 | _("Failed to not connect to `%s' service.\n"), "fs"); |
152 | return NULL; | 152 | return NULL; |
153 | } | 153 | } |
154 | gic = GNUNET_malloc (sizeof (struct GNUNET_FS_GetIndexedContext)); | 154 | gic = GNUNET_new (struct GNUNET_FS_GetIndexedContext); |
155 | gic->h = h; | 155 | gic->h = h; |
156 | gic->client = client; | 156 | gic->client = client; |
157 | gic->iterator = iterator; | 157 | gic->iterator = iterator; |
diff --git a/src/fs/fs_test_lib.c b/src/fs/fs_test_lib.c index 085ea3764..1e098bd60 100644 --- a/src/fs/fs_test_lib.c +++ b/src/fs/fs_test_lib.c | |||
@@ -452,7 +452,7 @@ GNUNET_FS_TEST_publish (struct GNUNET_TESTBED_Peer *peer, | |||
452 | { | 452 | { |
453 | struct TestPublishOperation *po; | 453 | struct TestPublishOperation *po; |
454 | 454 | ||
455 | po = GNUNET_malloc (sizeof (struct TestPublishOperation)); | 455 | po = GNUNET_new (struct TestPublishOperation); |
456 | po->publish_cont = cont; | 456 | po->publish_cont = cont; |
457 | po->publish_cont_cls = cont_cls; | 457 | po->publish_cont_cls = cont_cls; |
458 | po->publish_seed = seed; | 458 | po->publish_seed = seed; |
@@ -631,7 +631,7 @@ GNUNET_FS_TEST_download (struct GNUNET_TESTBED_Peer *peer, | |||
631 | { | 631 | { |
632 | struct TestDownloadOperation *dop; | 632 | struct TestDownloadOperation *dop; |
633 | 633 | ||
634 | dop = GNUNET_malloc (sizeof (struct TestDownloadOperation)); | 634 | dop = GNUNET_new (struct TestDownloadOperation); |
635 | dop->uri = GNUNET_FS_uri_dup (uri); | 635 | dop->uri = GNUNET_FS_uri_dup (uri); |
636 | dop->size = GNUNET_FS_uri_chk_get_file_size (uri); | 636 | dop->size = GNUNET_FS_uri_chk_get_file_size (uri); |
637 | dop->verbose = verbose; | 637 | dop->verbose = verbose; |
diff --git a/src/fs/fs_tree.c b/src/fs/fs_tree.c index 4e0ef8c5b..5dc39e4e6 100644 --- a/src/fs/fs_tree.c +++ b/src/fs/fs_tree.c | |||
@@ -276,7 +276,7 @@ GNUNET_FS_tree_encoder_create (struct GNUNET_FS_Handle *h, uint64_t size, | |||
276 | { | 276 | { |
277 | struct GNUNET_FS_TreeEncoder *te; | 277 | struct GNUNET_FS_TreeEncoder *te; |
278 | 278 | ||
279 | te = GNUNET_malloc (sizeof (struct GNUNET_FS_TreeEncoder)); | 279 | te = GNUNET_new (struct GNUNET_FS_TreeEncoder); |
280 | te->h = h; | 280 | te->h = h; |
281 | te->size = size; | 281 | te->size = size; |
282 | te->cls = cls; | 282 | te->cls = cls; |
@@ -347,7 +347,7 @@ GNUNET_FS_tree_encoder_next (struct GNUNET_FS_TreeEncoder *te) | |||
347 | off = CHK_PER_INODE * (te->chk_tree_depth - 1); | 347 | off = CHK_PER_INODE * (te->chk_tree_depth - 1); |
348 | GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "TE done, reading CHK `%s' from %u\n", | 348 | GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "TE done, reading CHK `%s' from %u\n", |
349 | GNUNET_h2s (&te->chk_tree[off].query), off); | 349 | GNUNET_h2s (&te->chk_tree[off].query), off); |
350 | te->uri = GNUNET_malloc (sizeof (struct GNUNET_FS_Uri)); | 350 | te->uri = GNUNET_new (struct GNUNET_FS_Uri); |
351 | te->uri->type = GNUNET_FS_URI_CHK; | 351 | te->uri->type = GNUNET_FS_URI_CHK; |
352 | te->uri->data.chk.chk = te->chk_tree[off]; | 352 | te->uri->data.chk.chk = te->chk_tree[off]; |
353 | te->uri->data.chk.file_length = GNUNET_htonll (te->size); | 353 | te->uri->data.chk.file_length = GNUNET_htonll (te->size); |
diff --git a/src/fs/fs_unindex.c b/src/fs/fs_unindex.c index 14ab0fd69..b446bab1b 100644 --- a/src/fs/fs_unindex.c +++ b/src/fs/fs_unindex.c | |||
@@ -767,7 +767,7 @@ GNUNET_FS_unindex_start (struct GNUNET_FS_Handle *h, | |||
767 | 767 | ||
768 | if (GNUNET_OK != GNUNET_DISK_file_size (filename, &size, GNUNET_YES, GNUNET_YES)) | 768 | if (GNUNET_OK != GNUNET_DISK_file_size (filename, &size, GNUNET_YES, GNUNET_YES)) |
769 | return NULL; | 769 | return NULL; |
770 | ret = GNUNET_malloc (sizeof (struct GNUNET_FS_UnindexContext)); | 770 | ret = GNUNET_new (struct GNUNET_FS_UnindexContext); |
771 | ret->h = h; | 771 | ret->h = h; |
772 | ret->filename = GNUNET_strdup (filename); | 772 | ret->filename = GNUNET_strdup (filename); |
773 | ret->start_time = GNUNET_TIME_absolute_get (); | 773 | ret->start_time = GNUNET_TIME_absolute_get (); |
diff --git a/src/fs/gnunet-auto-share.c b/src/fs/gnunet-auto-share.c index b001cb58c..2106d67f1 100644 --- a/src/fs/gnunet-auto-share.c +++ b/src/fs/gnunet-auto-share.c | |||
@@ -208,7 +208,7 @@ load_state () | |||
208 | (GNUNET_OK != | 208 | (GNUNET_OK != |
209 | GNUNET_BIO_read (rh, "id", &id, sizeof (struct GNUNET_HashCode))) ) | 209 | GNUNET_BIO_read (rh, "id", &id, sizeof (struct GNUNET_HashCode))) ) |
210 | goto error; | 210 | goto error; |
211 | wi = GNUNET_malloc (sizeof (struct WorkItem)); | 211 | wi = GNUNET_new (struct WorkItem); |
212 | wi->id = id; | 212 | wi->id = id; |
213 | wi->filename = fn; | 213 | wi->filename = fn; |
214 | GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, | 214 | GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, |
@@ -605,7 +605,7 @@ add_file (void *cls, | |||
605 | } | 605 | } |
606 | else | 606 | else |
607 | { | 607 | { |
608 | wi = GNUNET_malloc (sizeof (struct WorkItem)); | 608 | wi = GNUNET_new (struct WorkItem); |
609 | wi->filename = GNUNET_strdup (filename); | 609 | wi->filename = GNUNET_strdup (filename); |
610 | } | 610 | } |
611 | wi->id = id; | 611 | wi->id = id; |
diff --git a/src/fs/gnunet-helper-fs-publish.c b/src/fs/gnunet-helper-fs-publish.c index 214650b0f..c64dece42 100644 --- a/src/fs/gnunet-helper-fs-publish.c +++ b/src/fs/gnunet-helper-fs-publish.c | |||
@@ -328,7 +328,7 @@ preprocess_file (const char *filename, | |||
328 | : GNUNET_MESSAGE_TYPE_FS_PUBLISH_HELPER_PROGRESS_FILE, | 328 | : GNUNET_MESSAGE_TYPE_FS_PUBLISH_HELPER_PROGRESS_FILE, |
329 | filename, strlen (filename) + 1)) | 329 | filename, strlen (filename) + 1)) |
330 | return GNUNET_SYSERR; | 330 | return GNUNET_SYSERR; |
331 | item = GNUNET_malloc (sizeof (struct ScanTreeNode)); | 331 | item = GNUNET_new (struct ScanTreeNode); |
332 | item->filename = GNUNET_strdup (filename); | 332 | item->filename = GNUNET_strdup (filename); |
333 | item->is_directory = (S_ISDIR (sbuf.st_mode)) ? GNUNET_YES : GNUNET_NO; | 333 | item->is_directory = (S_ISDIR (sbuf.st_mode)) ? GNUNET_YES : GNUNET_NO; |
334 | item->file_size = fsize; | 334 | item->file_size = fsize; |
diff --git a/src/fs/gnunet-service-fs_pr.c b/src/fs/gnunet-service-fs_pr.c index e3ce8dd69..0af19d537 100644 --- a/src/fs/gnunet-service-fs_pr.c +++ b/src/fs/gnunet-service-fs_pr.c | |||
@@ -1078,7 +1078,7 @@ handle_dht_reply (void *cls, struct GNUNET_TIME_Absolute exp, | |||
1078 | GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, | 1078 | GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, |
1079 | "Replicating result for query `%s' with priority %u\n", | 1079 | "Replicating result for query `%s' with priority %u\n", |
1080 | GNUNET_h2s (key), prq.priority); | 1080 | GNUNET_h2s (key), prq.priority); |
1081 | pmc = GNUNET_malloc (sizeof (struct PutMigrationContext)); | 1081 | pmc = GNUNET_new (struct PutMigrationContext); |
1082 | pmc->start = GNUNET_TIME_absolute_get (); | 1082 | pmc->start = GNUNET_TIME_absolute_get (); |
1083 | pmc->requested = GNUNET_YES; | 1083 | pmc->requested = GNUNET_YES; |
1084 | if (NULL == | 1084 | if (NULL == |
@@ -1675,7 +1675,7 @@ GSF_handle_p2p_content_ (struct GSF_ConnectedPeer *cp, | |||
1675 | GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, | 1675 | GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, |
1676 | "Replicating result for query `%s' with priority %u\n", | 1676 | "Replicating result for query `%s' with priority %u\n", |
1677 | GNUNET_h2s (&query), prq.priority); | 1677 | GNUNET_h2s (&query), prq.priority); |
1678 | pmc = GNUNET_malloc (sizeof (struct PutMigrationContext)); | 1678 | pmc = GNUNET_new (struct PutMigrationContext); |
1679 | pmc->start = GNUNET_TIME_absolute_get (); | 1679 | pmc->start = GNUNET_TIME_absolute_get (); |
1680 | pmc->requested = prq.request_found; | 1680 | pmc->requested = prq.request_found; |
1681 | GNUNET_assert (0 != GSF_get_peer_performance_data_ (cp)->pid); | 1681 | GNUNET_assert (0 != GSF_get_peer_performance_data_ (cp)->pid); |
diff --git a/src/fs/perf_gnunet_service_fs_p2p.c b/src/fs/perf_gnunet_service_fs_p2p.c index 2462bb3f2..17a27f803 100644 --- a/src/fs/perf_gnunet_service_fs_p2p.c +++ b/src/fs/perf_gnunet_service_fs_p2p.c | |||
@@ -263,7 +263,7 @@ do_report (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc) | |||
263 | GNUNET_free (fancy); | 263 | GNUNET_free (fancy); |
264 | GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Finished download, shutting down\n", | 264 | GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Finished download, shutting down\n", |
265 | (unsigned long long) FILESIZE); | 265 | (unsigned long long) FILESIZE); |
266 | sm = GNUNET_malloc (sizeof (struct StatMaster)); | 266 | sm = GNUNET_new (struct StatMaster); |
267 | sm->op = | 267 | sm->op = |
268 | GNUNET_TESTBED_service_connect (NULL, | 268 | GNUNET_TESTBED_service_connect (NULL, |
269 | daemons[sm->daemon], | 269 | daemons[sm->daemon], |
diff --git a/src/fs/perf_gnunet_service_fs_p2p_respect.c b/src/fs/perf_gnunet_service_fs_p2p_respect.c index b2471a8b4..4d6de9a90 100644 --- a/src/fs/perf_gnunet_service_fs_p2p_respect.c +++ b/src/fs/perf_gnunet_service_fs_p2p_respect.c | |||
@@ -308,7 +308,7 @@ do_report (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc) | |||
308 | return; /* more downloads to come */ | 308 | return; /* more downloads to come */ |
309 | GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, | 309 | GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, |
310 | "Finished all downloads, getting statistics\n"); | 310 | "Finished all downloads, getting statistics\n"); |
311 | sm = GNUNET_malloc (sizeof (struct StatMaster)); | 311 | sm = GNUNET_new (struct StatMaster); |
312 | sm->op = | 312 | sm->op = |
313 | GNUNET_TESTBED_service_connect (NULL, | 313 | GNUNET_TESTBED_service_connect (NULL, |
314 | daemons[sm->daemon], | 314 | daemons[sm->daemon], |
diff --git a/src/fs/test_gnunet_service_fs_migration.c b/src/fs/test_gnunet_service_fs_migration.c index 770c212ba..4defe119b 100644 --- a/src/fs/test_gnunet_service_fs_migration.c +++ b/src/fs/test_gnunet_service_fs_migration.c | |||
@@ -151,7 +151,7 @@ do_wait (void *cls, const struct GNUNET_FS_Uri *uri, | |||
151 | return; | 151 | return; |
152 | } | 152 | } |
153 | GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Waiting to allow content to migrate\n"); | 153 | GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Waiting to allow content to migrate\n"); |
154 | dc = GNUNET_malloc (sizeof (struct DownloadContext)); | 154 | dc = GNUNET_new (struct DownloadContext); |
155 | dc->uri = GNUNET_FS_uri_dup (uri); | 155 | dc->uri = GNUNET_FS_uri_dup (uri); |
156 | if (NULL != fn) | 156 | if (NULL != fn) |
157 | dc->fn = GNUNET_strdup (fn); | 157 | dc->fn = GNUNET_strdup (fn); |