projects
/
oweals
/
gnunet.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
fix socket cmp, fix compiler warnings about unused args
[oweals/gnunet.git]
/
src
/
util
/
test_container_multipeermap.c
diff --git
a/src/util/test_container_multipeermap.c
b/src/util/test_container_multipeermap.c
index aa67eb5e0f59469e2e5ee121a199e63b8afe7f1b..a8ec8b8f241852adfb558d2fe948ffb4e1e9d28f 100644
(file)
--- a/
src/util/test_container_multipeermap.c
+++ b/
src/util/test_container_multipeermap.c
@@
-1,21
+1,21
@@
/*
This file is part of GNUnet.
/*
This file is part of GNUnet.
- (C) 2008, 2013 Christian Grothoff (and other contributing authors)
+ Copyright (C) 2008, 2013 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
- by the Free Software Foundation
; either version 3, or (at your
- option) any later version.
+ GNUnet is free software
: you can redistribute it and/or modify it
+
under the terms of the GNU Affero
General Public License as published
+ by the Free Software Foundation
, either version 3 of the License,
+ o
r (at your o
ption) any later version.
GNUnet is distributed in the hope that it will be useful, but
WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
GNUnet is distributed in the hope that it will be useful, but
WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- General Public License for more details.
+ Affero General Public License for more details.
+
+ You should have received a copy of the GNU Affero General Public License
+ along with this program. If not, see <http://www.gnu.org/licenses/>.
- 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., 59 Temple Place - Suite 330,
- Boston, MA 02111-1307, USA.
+ SPDX-License-Identifier: AGPL3.0-or-later
*/
/**
*/
/**
@@
-25,10
+25,9
@@
*/
#include "platform.h"
*/
#include "platform.h"
-#include "gnunet_common.h"
-#include "gnunet_container_lib.h"
+#include "gnunet_util_lib.h"
-#define ABORT() { fprintf(stderr, "Error at %s:%d\n", __FILE__, __LINE__); if (NULL != m) GNUNET_CONTAINER_multipeermap_destroy(m); return 1; }
+#define ABORT() { fprintf(stderr, "Error at %s:%d\n", __FILE__, __LINE__); if (NULL != m) GNUNET_CONTAINER_multipeermap_destroy(m);
if (NULL != iter) GNUNET_CONTAINER_multipeermap_iterator_destroy (iter);
return 1; }
#define CHECK(c) { if (! (c)) ABORT(); }
static int
#define CHECK(c) { if (! (c)) ABORT(); }
static int
@@
-37,7
+36,7
@@
testMap (int i)
struct GNUNET_CONTAINER_MultiPeerMap *m;
struct GNUNET_PeerIdentity k1;
struct GNUNET_PeerIdentity k2;
struct GNUNET_CONTAINER_MultiPeerMap *m;
struct GNUNET_PeerIdentity k1;
struct GNUNET_PeerIdentity k2;
- struct GNUNET_CONTAINER_MultiPeerMapIterator *iter;
+ struct GNUNET_CONTAINER_MultiPeerMapIterator *iter
= NULL
;
struct GNUNET_PeerIdentity key_ret;
const char *ret;
int j;
struct GNUNET_PeerIdentity key_ret;
const char *ret;
int j;
@@
-98,7
+97,7
@@
testMap (int i)
for (j = 0; j < GNUNET_CONTAINER_multipeermap_size (m); j++)
CHECK (GNUNET_YES == GNUNET_CONTAINER_multipeermap_iterator_next (iter, NULL, NULL));
CHECK (GNUNET_NO == GNUNET_CONTAINER_multipeermap_iterator_next (iter, NULL, NULL));
for (j = 0; j < GNUNET_CONTAINER_multipeermap_size (m); j++)
CHECK (GNUNET_YES == GNUNET_CONTAINER_multipeermap_iterator_next (iter, NULL, NULL));
CHECK (GNUNET_NO == GNUNET_CONTAINER_multipeermap_iterator_next (iter, NULL, NULL));
- GNUNET_
free
(iter);
+ GNUNET_
CONTAINER_multipeermap_iterator_destroy
(iter);
GNUNET_CONTAINER_multipeermap_destroy (m);
return 0;
GNUNET_CONTAINER_multipeermap_destroy (m);
return 0;