projects
/
oweals
/
gnunet.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'master' of git+ssh://gnunet.org/gnunet
[oweals/gnunet.git]
/
src
/
fs
/
fs_tree.c
diff --git
a/src/fs/fs_tree.c
b/src/fs/fs_tree.c
index 715ecddb15f028753edcb14019ec9e06df5c76a3..e57e4e4943e806adcc2e8ba4367203f23076bd5c 100644
(file)
--- a/
src/fs/fs_tree.c
+++ b/
src/fs/fs_tree.c
@@
-1,6
+1,6
@@
/*
This file is part of GNUnet.
/*
This file is part of GNUnet.
- (C) 2009-2011 Christian Grothoff (and other contributing authors)
+ Copyright (C) 2009-2011 GNUnet e.V.
GNUnet is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published
GNUnet is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published
@@
-14,8
+14,8
@@
You should have received a copy of the GNU General Public License
along with GNUnet; see the file COPYING. If not, write to the
You should have received a copy of the GNU General Public License
along with GNUnet; see the file COPYING. If not, write to the
- Free Software Foundation, Inc., 5
9 Temple Place - Suite 330
,
- Boston, MA 0211
1-1307
, USA.
+ Free Software Foundation, Inc., 5
1 Franklin Street, Fifth Floor
,
+ Boston, MA 0211
0-1301
, USA.
*/
/**
* @file fs/fs_tree.c
*/
/**
* @file fs/fs_tree.c
@@
-285,9
+285,9
@@
GNUNET_FS_tree_encoder_create (struct GNUNET_FS_Handle *h, uint64_t size,
te->progress = progress;
te->cont = cont;
te->chk_tree_depth = GNUNET_FS_compute_depth (size);
te->progress = progress;
te->cont = cont;
te->chk_tree_depth = GNUNET_FS_compute_depth (size);
- te->chk_tree
=
- GNUNET_malloc (te->chk_tree_depth * CHK_PER_INODE *
-
sizeof (struct ContentHashKey)
);
+ te->chk_tree
+ = GNUNET_new_array (te->chk_tree_depth * CHK_PER_INODE,
+
struct ContentHashKey
);
GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
"Created tree encoder for file with %llu bytes and depth %u\n",
(unsigned long long) size,
GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
"Created tree encoder for file with %llu bytes and depth %u\n",
(unsigned long long) size,
@@
-352,7
+352,7
@@
GNUNET_FS_tree_encoder_next (struct GNUNET_FS_TreeEncoder *te)
te->uri->data.chk.chk = te->chk_tree[off];
te->uri->data.chk.file_length = GNUNET_htonll (te->size);
te->in_next = GNUNET_NO;
te->uri->data.chk.chk = te->chk_tree[off];
te->uri->data.chk.file_length = GNUNET_htonll (te->size);
te->in_next = GNUNET_NO;
- te->cont (te->cls
, NULL
);
+ te->cont (te->cls);
return;
}
if (0 == te->current_depth)
return;
}
if (0 == te->current_depth)
@@
-363,7
+363,7
@@
GNUNET_FS_tree_encoder_next (struct GNUNET_FS_TreeEncoder *te)
te->reader (te->cls, te->publish_offset, pt_size, iob, &te->emsg))
{
te->in_next = GNUNET_NO;
te->reader (te->cls, te->publish_offset, pt_size, iob, &te->emsg))
{
te->in_next = GNUNET_NO;
- te->cont (te->cls
, NULL
);
+ te->cont (te->cls);
return;
}
pt_block = iob;
return;
}
pt_block = iob;