projects
/
oweals
/
gnunet.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
- compiler warning
[oweals/gnunet.git]
/
src
/
namecache
/
test_namecache_api_cache_block.c
diff --git
a/src/namecache/test_namecache_api_cache_block.c
b/src/namecache/test_namecache_api_cache_block.c
index f935ad15985319d05ce7a33bf3abf66bbbc91e48..dea664f42bfe4fd93130eccf54d2bc68674d4df3 100644
(file)
--- a/
src/namecache/test_namecache_api_cache_block.c
+++ b/
src/namecache/test_namecache_api_cache_block.c
@@
-1,6
+1,6
@@
/*
This file is part of GNUnet.
/*
This file is part of GNUnet.
- (C) 2012 Christian Grothoff (and other contributing authors)
+
Copyright
(C) 2012 Christian Grothoff (and other contributing authors)
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 namecache/test_namecache_api.c
*/
/**
* @file namecache/test_namecache_api.c
@@
-36,7
+36,7
@@
static struct GNUNET_NAMECACHE_Handle *nsh;
static struct GNUNET_NAMECACHE_Handle *nsh;
-static
GNUNET_SCHEDULER_TaskIdentifier
endbadly_task;
+static
struct GNUNET_SCHEDULER_Task *
endbadly_task;
static struct GNUNET_CRYPTO_EcdsaPrivateKey *privkey;
static struct GNUNET_CRYPTO_EcdsaPrivateKey *privkey;
@@
-122,17
+122,17
@@
name_lookup_proc (void *cls,
GNUNET_assert (NULL != cls);
GNUNET_assert (NULL != cls);
- if (endbadly_task !=
GNUNET_SCHEDULER_NO_TASK
)
+ if (endbadly_task !=
NULL
)
{
GNUNET_SCHEDULER_cancel (endbadly_task);
{
GNUNET_SCHEDULER_cancel (endbadly_task);
- endbadly_task =
GNUNET_SCHEDULER_NO_TASK
;
+ endbadly_task =
NULL
;
}
if (NULL == block)
{
GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
_("Namecache returned no block\n"));
}
if (NULL == block)
{
GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
_("Namecache returned no block\n"));
- if (endbadly_task !=
GNUNET_SCHEDULER_NO_TASK
)
+ if (endbadly_task !=
NULL
)
GNUNET_SCHEDULER_cancel (endbadly_task);
endbadly_task = GNUNET_SCHEDULER_add_now (&endbadly, NULL);
return;
GNUNET_SCHEDULER_cancel (endbadly_task);
endbadly_task = GNUNET_SCHEDULER_add_now (&endbadly, NULL);
return;
@@
-195,11
+195,15
@@
run (void *cls,
rd.flags = 0;
memset ((char *) rd.data, 'a', TEST_RECORD_DATALEN);
block = GNUNET_GNSRECORD_block_create (privkey,
rd.flags = 0;
memset ((char *) rd.data, 'a', TEST_RECORD_DATALEN);
block = GNUNET_GNSRECORD_block_create (privkey,
- GNUNET_TIME_UNIT_FOREVER_ABS, name, &rd, 1 );
+ GNUNET_TIME_UNIT_FOREVER_ABS,
+ name, &rd, 1);
if (NULL == block)
{
GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
if (NULL == block)
{
GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
- _("Namecache cannot cache no block\n"));
+ "Namecache cannot cache no block!\n");
+ GNUNET_SCHEDULER_shutdown ();
+ GNUNET_free (block);
+ return;
}
nsh = GNUNET_NAMECACHE_connect (cfg);
}
nsh = GNUNET_NAMECACHE_connect (cfg);
@@
-207,16
+211,21
@@
run (void *cls,
{
GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
_("Namecache cannot connect to namecache\n"));
{
GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
_("Namecache cannot connect to namecache\n"));
+ GNUNET_SCHEDULER_shutdown ();
+ GNUNET_free (block);
+ return;
}
GNUNET_break (NULL != nsh);
}
GNUNET_break (NULL != nsh);
- nsqe = GNUNET_NAMECACHE_block_cache (nsh, block , &cache_cont, (void *) name);
+ nsqe = GNUNET_NAMECACHE_block_cache (nsh,
+ block,
+ &cache_cont, (void *) name);
if (NULL == nsqe)
{
GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
_("Namecache cannot cache no block\n"));
}
if (NULL == nsqe)
{
GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
_("Namecache cannot cache no block\n"));
}
-
+ GNUNET_free (block);
GNUNET_free ((void *)rd.data);
}
GNUNET_free ((void *)rd.data);
}