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 'credentials' of git+ssh://gnunet.org/gnunet into credentials
[oweals/gnunet.git]
/
src
/
datacache
/
plugin_datacache_heap.c
diff --git
a/src/datacache/plugin_datacache_heap.c
b/src/datacache/plugin_datacache_heap.c
index 5492a8ec59bf44e4d6005612fd49bd791122fc9d..185d54f2f81d18d02630e6bae8c1dab8607ea177 100644
(file)
--- a/
src/datacache/plugin_datacache_heap.c
+++ b/
src/datacache/plugin_datacache_heap.c
@@
-1,6
+1,6
@@
/*
This file is part of GNUnet
/*
This file is part of GNUnet
- Copyright (C) 2012, 2015
Christian Grothoff (and other contributing authors)
+ Copyright (C) 2012, 2015
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.
*/
/**
*/
/**
@@
-177,7
+177,7
@@
put_cb (void *cls,
GNUNET_array_grow (val->path_info,
val->path_info_len,
put_ctx->path_info_len);
GNUNET_array_grow (val->path_info,
val->path_info_len,
put_ctx->path_info_len);
- memcpy (val->path_info,
+
GNUNET_
memcpy (val->path_info,
put_ctx->path_info,
put_ctx->path_info_len * sizeof (struct GNUNET_PeerIdentity));
GNUNET_CONTAINER_heap_update_cost (put_ctx->heap,
put_ctx->path_info,
put_ctx->path_info_len * sizeof (struct GNUNET_PeerIdentity));
GNUNET_CONTAINER_heap_update_cost (put_ctx->heap,
@@
-237,7
+237,7
@@
heap_plugin_put (void *cls,
if (GNUNET_YES == put_ctx.found)
return 0;
val = GNUNET_malloc (sizeof (struct Value) + size);
if (GNUNET_YES == put_ctx.found)
return 0;
val = GNUNET_malloc (sizeof (struct Value) + size);
- memcpy (&val[1], data, size);
+
GNUNET_
memcpy (&val[1], data, size);
val->key = *key;
val->type = type;
val->discard_time = discard_time;
val->key = *key;
val->type = type;
val->discard_time = discard_time;
@@
-245,7
+245,8
@@
heap_plugin_put (void *cls,
GNUNET_array_grow (val->path_info,
val->path_info_len,
path_info_len);
GNUNET_array_grow (val->path_info,
val->path_info_len,
path_info_len);
- memcpy (val->path_info, path_info,
+ GNUNET_memcpy (val->path_info,
+ path_info,
path_info_len * sizeof (struct GNUNET_PeerIdentity));
(void) GNUNET_CONTAINER_multihashmap_put (plugin->map,
&val->key,
path_info_len * sizeof (struct GNUNET_PeerIdentity));
(void) GNUNET_CONTAINER_multihashmap_put (plugin->map,
&val->key,