projects
/
oweals
/
gnunet.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
spell out message types more, use correct conversion direction
[oweals/gnunet.git]
/
src
/
identity
/
gnunet-identity.c
diff --git
a/src/identity/gnunet-identity.c
b/src/identity/gnunet-identity.c
index c167ce95937e9eb3527d6bfd22ee09a1eaefa9ed..f632aa0a8d76979ee8d9c0d237e85858506eedb3 100644
(file)
--- a/
src/identity/gnunet-identity.c
+++ b/
src/identity/gnunet-identity.c
@@
-1,6
+1,6
@@
/*
This file is part of GNUnet.
/*
This file is part of GNUnet.
- Copyright (C) 2013
Christian Grothoff (and other contributing authors)
+ Copyright (C) 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
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 identity/gnunet-identity.c
*/
/**
* @file identity/gnunet-identity.c
@@
-84,11
+84,9
@@
static struct GNUNET_IDENTITY_Operation *delete_op;
* Task run on shutdown.
*
* @param cls NULL
* Task run on shutdown.
*
* @param cls NULL
- * @param tc unused
*/
static void
*/
static void
-shutdown_task (void *cls,
- const struct GNUNET_SCHEDULER_TaskContext *tc)
+shutdown_task (void *cls)
{
if (NULL != set_op)
{
{
if (NULL != set_op)
{
@@
-304,8
+302,7
@@
run (void *cls, char *const *args, const char *cfgfile,
create_ego,
&create_finished,
&create_op);
create_ego,
&create_finished,
&create_op);
- GNUNET_SCHEDULER_add_delayed (GNUNET_TIME_UNIT_FOREVER_REL,
- &shutdown_task, NULL);
+ GNUNET_SCHEDULER_add_shutdown (&shutdown_task, NULL);
test_finished ();
}
test_finished ();
}
@@
-338,7
+335,7
@@
main (int argc, char *const *argv)
{'m', "monitor", NULL,
gettext_noop ("run in monitor mode egos"),
0, &GNUNET_GETOPT_set_one, &monitor},
{'m', "monitor", NULL,
gettext_noop ("run in monitor mode egos"),
0, &GNUNET_GETOPT_set_one, &monitor},
- {'s', "set", "SUBSYS
YS
TEM",
+ {'s', "set", "SUBSYSTEM",
gettext_noop ("set default identity to EGO for a subsystem SUBSYSTEM (use together with -e)"),
1, &GNUNET_GETOPT_set_string, &set_subsystem},
GNUNET_GETOPT_OPTION_END
gettext_noop ("set default identity to EGO for a subsystem SUBSYSTEM (use together with -e)"),
1, &GNUNET_GETOPT_set_string, &set_subsystem},
GNUNET_GETOPT_OPTION_END