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_to_name.c
diff --git
a/src/namestore/test_namestore_api_zone_to_name.c
b/src/namestore/test_namestore_api_zone_to_name.c
index 26593547bc5f11d29c55f804f4be9b2dcf261443..31ec84a81f3f0ae292105aa5affb2b596f16effb 100644
(file)
--- a/
src/namestore/test_namestore_api_zone_to_name.c
+++ b/
src/namestore/test_namestore_api_zone_to_name.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_to_name.c
*/
/**
* @file namestore/test_namestore_api_zone_to_name.c
@@
-39,7
+39,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;
@@
-73,11
+73,6
@@
endbadly (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
nsh = NULL;
if (privkey != NULL)
GNUNET_free (privkey);
nsh = NULL;
if (privkey != NULL)
GNUNET_free (privkey);
- if (NULL != directory)
- {
- GNUNET_DISK_directory_remove (directory);
- GNUNET_free (directory);
- }
privkey = NULL;
res = 1;
}
privkey = NULL;
res = 1;
}
@@
-86,21
+81,16
@@
endbadly (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
static void
end (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
{
static void
end (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
{
- 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)
GNUNET_free (privkey);
privkey = NULL;
if (nsh != NULL)
GNUNET_NAMESTORE_disconnect (nsh);
}
if (privkey != NULL)
GNUNET_free (privkey);
privkey = NULL;
if (nsh != NULL)
GNUNET_NAMESTORE_disconnect (nsh);
- if (NULL != directory)
- {
- GNUNET_DISK_directory_remove (directory);
- GNUNET_free (directory);
- }
nsh = NULL;
}
nsh = NULL;
}
@@
-180,6
+170,7
@@
run (void *cls,
directory = NULL;
GNUNET_CONFIGURATION_get_value_string(cfg, "PATHS", "GNUNET_TEST_HOME", &directory);
directory = NULL;
GNUNET_CONFIGURATION_get_value_string(cfg, "PATHS", "GNUNET_TEST_HOME", &directory);
+ GNUNET_DISK_directory_remove (directory);
endbadly_task = GNUNET_SCHEDULER_add_delayed(TIMEOUT,endbadly, NULL);
GNUNET_asprintf (&s_name, "dummy");
endbadly_task = GNUNET_SCHEDULER_add_delayed(TIMEOUT,endbadly, NULL);
GNUNET_asprintf (&s_name, "dummy");
@@
-232,7
+223,14
@@
main (int argc, char *argv[])
"test_namestore_api.conf",
&run,
NULL))
"test_namestore_api.conf",
&run,
NULL))
- return 1;
+ {
+ res = 1;
+ }
+ if (NULL != directory)
+ {
+ GNUNET_DISK_directory_remove (directory);
+ GNUNET_free (directory);
+ }
return res;
}
return res;
}