projects
/
oweals
/
gnunet.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
-fixed _clear() in peers "helper"
[oweals/gnunet.git]
/
src
/
namestore
/
test_namestore_api_zone_iteration_stop.c
diff --git
a/src/namestore/test_namestore_api_zone_iteration_stop.c
b/src/namestore/test_namestore_api_zone_iteration_stop.c
index a5730ff21e459479fc26b584ebbb6cd8345405a5..8e8f68cfbbe2be52b6b0f14b5125cf3d48f279d3 100644
(file)
--- a/
src/namestore/test_namestore_api_zone_iteration_stop.c
+++ b/
src/namestore/test_namestore_api_zone_iteration_stop.c
@@
-1,6
+1,6
@@
/*
This file is part of GNUnet.
/*
This file is part of GNUnet.
- (C) 2009 Christian Grothoff (and other contributing authors)
+
Copyright
(C) 2009 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 namestore/test_namestore_api_zone_iteration.c
*/
/**
* @file namestore/test_namestore_api_zone_iteration.c
@@
-32,7
+32,7
@@
static struct GNUNET_NAMESTORE_Handle * nsh;
static struct GNUNET_NAMESTORE_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;
@@
-118,10
+118,10
@@
end (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
zi = NULL;
}
zi = NULL;
}
- 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 (privkey != NULL)
}
if (privkey != NULL)
@@
-266,10
+266,10
@@
zone_proc (void *cls,
"Telling namestore to stop zone iteration\n");
GNUNET_NAMESTORE_zone_iteration_stop (zi);
zi = NULL;
"Telling namestore to stop zone iteration\n");
GNUNET_NAMESTORE_zone_iteration_stop (zi);
zi = NULL;
- if (
GNUNET_SCHEDULER_NO_TASK
!= endbadly_task)
+ if (
NULL
!= endbadly_task)
{
GNUNET_SCHEDULER_cancel (endbadly_task);
{
GNUNET_SCHEDULER_cancel (endbadly_task);
- endbadly_task =
GNUNET_SCHEDULER_NO_TASK
;
+ endbadly_task =
NULL
;
}
res = 0;
GNUNET_SCHEDULER_add_delayed (WAIT, &end, NULL);
}
res = 0;
GNUNET_SCHEDULER_add_delayed (WAIT, &end, NULL);
@@
-303,7
+303,7
@@
put_cont (void *cls, int32_t success, const char *emsg)
GNUNET_log (GNUNET_ERROR_TYPE_ERROR, "Failed to created records: `%s'\n",
emsg);
GNUNET_break (0);
GNUNET_log (GNUNET_ERROR_TYPE_ERROR, "Failed to created records: `%s'\n",
emsg);
GNUNET_break (0);
- if (
GNUNET_SCHEDULER_NO_TASK
!= endbadly_task)
+ if (
NULL
!= endbadly_task)
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;
@@
-322,7
+322,7
@@
put_cont (void *cls, int32_t success, const char *emsg)
{
GNUNET_log (GNUNET_ERROR_TYPE_ERROR, "Failed to create zone iterator\n");
GNUNET_break (0);
{
GNUNET_log (GNUNET_ERROR_TYPE_ERROR, "Failed to create zone iterator\n");
GNUNET_break (0);
- if (
GNUNET_SCHEDULER_NO_TASK
!= endbadly_task)
+ if (
NULL
!= endbadly_task)
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;
@@
-371,7
+371,7
@@
empty_zone_proc (void *cls,
GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
_("Expected empty zone but received zone private key\n"));
GNUNET_break (0);
GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
_("Expected empty zone but received zone private key\n"));
GNUNET_break (0);
- 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;
@@
-381,7
+381,7
@@
empty_zone_proc (void *cls,
GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
_("Expected no zone content but received data\n"));
GNUNET_break (0);
GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
_("Expected no zone content but received data\n"));
GNUNET_break (0);
- 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;
@@
-431,11
+431,14
@@
run (void *cls,
const struct GNUNET_CONFIGURATION_Handle *cfg,
struct GNUNET_TESTING_Peer *peer)
{
const struct GNUNET_CONFIGURATION_Handle *cfg,
struct GNUNET_TESTING_Peer *peer)
{
- directory = NULL;
- GNUNET_CONFIGURATION_get_value_string(cfg, "PATHS", "GNUNET_TEST_HOME", &directory);
+ GNUNET_assert (GNUNET_OK ==
+ GNUNET_CONFIGURATION_get_value_string (cfg,
+ "PATHS",
+ "GNUNET_TEST_HOME",
+ &directory));
GNUNET_DISK_directory_remove (directory);
GNUNET_DISK_directory_remove (directory);
- endbadly_task = GNUNET_SCHEDULER_add_delayed(TIMEOUT, &endbadly, NULL);
+ endbadly_task = GNUNET_SCHEDULER_add_delayed
(TIMEOUT, &endbadly, NULL);
nsh = GNUNET_NAMESTORE_connect (cfg);
GNUNET_break (NULL != nsh);
/* first, iterate over empty namestore */
nsh = GNUNET_NAMESTORE_connect (cfg);
GNUNET_break (NULL != nsh);
/* first, iterate over empty namestore */
@@
-443,7
+446,8
@@
run (void *cls,
NULL, &empty_zone_proc, nsh);
if (NULL == zi)
{
NULL, &empty_zone_proc, nsh);
if (NULL == zi)
{
- GNUNET_log (GNUNET_ERROR_TYPE_ERROR, "Failed to create zone iterator\n");
+ GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
+ "Failed to create zone iterator\n");
GNUNET_break (0);
GNUNET_SCHEDULER_cancel (endbadly_task);
endbadly_task = GNUNET_SCHEDULER_add_now (&endbadly, NULL);
GNUNET_break (0);
GNUNET_SCHEDULER_cancel (endbadly_task);
endbadly_task = GNUNET_SCHEDULER_add_now (&endbadly, NULL);