projects
/
oweals
/
gnunet.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
introducing GNUNET_CRYPTO_ecdhe_create2() to avoid malloc nonsense
[oweals/gnunet.git]
/
src
/
include
/
gnunet_configuration_lib.h
diff --git
a/src/include/gnunet_configuration_lib.h
b/src/include/gnunet_configuration_lib.h
index 2aaaac5831c256f8e75d286705382667220c7ed7..746dea61fe77b20fc0f4b4ef3d3ae7353a46915b 100644
(file)
--- a/
src/include/gnunet_configuration_lib.h
+++ b/
src/include/gnunet_configuration_lib.h
@@
-1,6
+1,6
@@
/*
This file is part of GNUnet.
/*
This file is part of GNUnet.
- Copyright (C) 2006, 2008, 2009
Christian Grothoff (and other contributing authors)
+ Copyright (C) 2006, 2008, 2009
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,20
+14,24
@@
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 include/gnunet_configuration_lib.h
- * @brief configuration API
* @author Christian Grothoff
* @author Christian Grothoff
- * @defgroup configuration Configuration management
+ *
+ * @file
+ * Configuration API
+ *
+ * @defgroup configuration Configuration library
+ * Configuration management
* @{
*/
#ifndef GNUNET_CONFIGURATION_LIB_H
#define GNUNET_CONFIGURATION_LIB_H
* @{
*/
#ifndef GNUNET_CONFIGURATION_LIB_H
#define GNUNET_CONFIGURATION_LIB_H
+#include "gnunet_time_lib.h"
#ifdef __cplusplus
extern "C"
#ifdef __cplusplus
extern "C"
@@
-85,7
+89,7
@@
GNUNET_CONFIGURATION_load (struct GNUNET_CONFIGURATION_Handle *cfg,
/**
* Load default configuration. This function will parse the
/**
* Load default configuration. This function will parse the
- * defaults from the given defaults_d directory.
+ * defaults from the given
@a
defaults_d directory.
*
* @param cfg configuration to update
* @param defaults_d directory with the defaults
*
* @param cfg configuration to update
* @param defaults_d directory with the defaults
@@
-136,7
+140,7
@@
GNUNET_CONFIGURATION_serialize (const struct GNUNET_CONFIGURATION_Handle *cfg,
int
GNUNET_CONFIGURATION_deserialize (struct GNUNET_CONFIGURATION_Handle *cfg,
const char *mem,
int
GNUNET_CONFIGURATION_deserialize (struct GNUNET_CONFIGURATION_Handle *cfg,
const char *mem,
-
const
size_t size,
+ size_t size,
int allow_inline);
int allow_inline);
@@
-539,8
+543,6
@@
GNUNET_CONFIGURATION_append_value_filename (struct GNUNET_CONFIGURATION_Handle *
const char *option,
const char *value);
const char *option,
const char *value);
-/** @} */ /* end of group configuration */
-
#if 0 /* keep Emacsens' auto-indent happy */
{
#endif
#if 0 /* keep Emacsens' auto-indent happy */
{
#endif
@@
-549,3
+551,5
@@
GNUNET_CONFIGURATION_append_value_filename (struct GNUNET_CONFIGURATION_Handle *
#endif
#endif
#endif
#endif
+
+/** @} */ /* end of group configuration */