summaryrefslogtreecommitdiff
path: root/src/fs
diff options
context:
space:
mode:
Diffstat (limited to 'src/fs')
-rw-r--r--src/fs/gnunet-auto-share.c12
-rw-r--r--src/fs/gnunet-download.c16
-rw-r--r--src/fs/gnunet-fs-profiler.c6
-rw-r--r--src/fs/gnunet-fs.c4
-rw-r--r--src/fs/gnunet-publish.c26
-rw-r--r--src/fs/gnunet-search.c12
-rw-r--r--src/fs/gnunet-unindex.c2
7 files changed, 39 insertions, 39 deletions
diff --git a/src/fs/gnunet-auto-share.c b/src/fs/gnunet-auto-share.c
index 2f980520a..0976b37e4 100644
--- a/src/fs/gnunet-auto-share.c
+++ b/src/fs/gnunet-auto-share.c
@@ -761,35 +761,35 @@ main (int argc, char *const *argv)
{
struct GNUNET_GETOPT_CommandLineOption options[] = {
- GNUNET_GETOPT_OPTION_SET_UINT ('a',
+ GNUNET_GETOPT_option_uint ('a',
"anonymity",
"LEVEL",
gettext_noop ("set the desired LEVEL of sender-anonymity"),
&anonymity_level),
- GNUNET_GETOPT_OPTION_SET_ONE ('d',
+ GNUNET_GETOPT_option_flag ('d',
"disable-creation-time",
gettext_noop ("disable adding the creation time to the metadata of the uploaded file"),
&do_disable_creation_time),
- GNUNET_GETOPT_OPTION_SET_ONE ('D',
+ GNUNET_GETOPT_option_flag ('D',
"disable-extractor",
gettext_noop ("do not use libextractor to add keywords or metadata"),
&disable_extractor),
- GNUNET_GETOPT_OPTION_SET_UINT ('p',
+ GNUNET_GETOPT_option_uint ('p',
"priority",
"PRIORITY",
gettext_noop ("specify the priority of the content"),
&content_priority),
- GNUNET_GETOPT_OPTION_SET_UINT ('r',
+ GNUNET_GETOPT_option_uint ('r',
"replication",
"LEVEL",
gettext_noop ("set the desired replication LEVEL"),
&replication_level),
- GNUNET_GETOPT_OPTION_VERBOSE (&verbose),
+ GNUNET_GETOPT_option_verbose (&verbose),
GNUNET_GETOPT_OPTION_END
};
diff --git a/src/fs/gnunet-download.c b/src/fs/gnunet-download.c
index 4d6f30587..83c1eb505 100644
--- a/src/fs/gnunet-download.c
+++ b/src/fs/gnunet-download.c
@@ -300,46 +300,46 @@ int
main (int argc, char *const *argv)
{
struct GNUNET_GETOPT_CommandLineOption options[] = {
- GNUNET_GETOPT_OPTION_SET_UINT ('a',
+ GNUNET_GETOPT_option_uint ('a',
"anonymity",
"LEVEL",
gettext_noop ("set the desired LEVEL of receiver-anonymity"),
&anonymity),
- GNUNET_GETOPT_OPTION_SET_ONE ('D',
+ GNUNET_GETOPT_option_flag ('D',
"delete-incomplete",
gettext_noop ("delete incomplete downloads (when aborted with CTRL-C)"),
&delete_incomplete),
- GNUNET_GETOPT_OPTION_SET_ONE ('n',
+ GNUNET_GETOPT_option_flag ('n',
"no-network",
gettext_noop ("only search the local peer (no P2P network search)"),
&local_only),
- GNUNET_GETOPT_OPTION_STRING ('o',
+ GNUNET_GETOPT_option_string ('o',
"output",
"FILENAME",
gettext_noop ("write the file to FILENAME"),
&filename),
- GNUNET_GETOPT_OPTION_SET_UINT ('p',
+ GNUNET_GETOPT_option_uint ('p',
"parallelism",
"DOWNLOADS",
gettext_noop ("set the maximum number of parallel downloads that is allowed"),
&parallelism),
- GNUNET_GETOPT_OPTION_SET_UINT ('r',
+ GNUNET_GETOPT_option_uint ('r',
"request-parallelism",
"REQUESTS",
gettext_noop ("set the maximum number of parallel requests for blocks that is allowed"),
&request_parallelism),
- GNUNET_GETOPT_OPTION_SET_ONE ('R',
+ GNUNET_GETOPT_option_flag ('R',
"recursive",
gettext_noop ("download a GNUnet directory recursively"),
&do_recursive),
- GNUNET_GETOPT_OPTION_INCREMENT_VALUE ('V',
+ GNUNET_GETOPT_option_increment_uint ('V',
"verbose",
gettext_noop ("be verbose (print progress information)"),
&verbose),
diff --git a/src/fs/gnunet-fs-profiler.c b/src/fs/gnunet-fs-profiler.c
index fb99d8f90..ac9f6777f 100644
--- a/src/fs/gnunet-fs-profiler.c
+++ b/src/fs/gnunet-fs-profiler.c
@@ -205,19 +205,19 @@ main (int argc, char *const *argv)
{
struct GNUNET_GETOPT_CommandLineOption options[] = {
- GNUNET_GETOPT_OPTION_SET_UINT ('n',
+ GNUNET_GETOPT_option_uint ('n',
"num-peers",
"COUNT",
gettext_noop ("run the experiment with COUNT peers"),
&num_peers),
- GNUNET_GETOPT_OPTION_STRING ('H',
+ GNUNET_GETOPT_option_string ('H',
"hosts",
"HOSTFILE",
gettext_noop ("specifies name of a file with the HOSTS the testbed should use"),
&host_filename),
- GNUNET_GETOPT_OPTION_SET_RELATIVE_TIME ('t',
+ GNUNET_GETOPT_option_relative_time ('t',
"timeout",
"DELAY",
gettext_noop ("automatically terminate experiment after DELAY"),
diff --git a/src/fs/gnunet-fs.c b/src/fs/gnunet-fs.c
index 2b24b7124..ad8f223ff 100644
--- a/src/fs/gnunet-fs.c
+++ b/src/fs/gnunet-fs.c
@@ -114,12 +114,12 @@ main (int argc, char *const *argv)
{
struct GNUNET_GETOPT_CommandLineOption options[] = {
- GNUNET_GETOPT_OPTION_SET_ONE ('i',
+ GNUNET_GETOPT_option_flag ('i',
"list-indexed",
gettext_noop ("print a list of all indexed files"),
&list_indexed_files),
- GNUNET_GETOPT_OPTION_VERBOSE (&verbose),
+ GNUNET_GETOPT_option_verbose (&verbose),
GNUNET_GETOPT_OPTION_END
};
diff --git a/src/fs/gnunet-publish.c b/src/fs/gnunet-publish.c
index 2229e45e7..395aad7db 100644
--- a/src/fs/gnunet-publish.c
+++ b/src/fs/gnunet-publish.c
@@ -894,24 +894,24 @@ int
main (int argc, char *const *argv)
{
struct GNUNET_GETOPT_CommandLineOption options[] = {
- GNUNET_GETOPT_OPTION_SET_UINT ('a',
+ GNUNET_GETOPT_option_uint ('a',
"anonymity",
"LEVEL",
gettext_noop ("set the desired LEVEL of sender-anonymity"),
&bo.anonymity_level),
- GNUNET_GETOPT_OPTION_SET_ONE ('d',
+ GNUNET_GETOPT_option_flag ('d',
"disable-creation-time",
gettext_noop ("disable adding the creation time to the "
"metadata of the uploaded file"),
&do_disable_creation_time),
- GNUNET_GETOPT_OPTION_SET_ONE ('D',
+ GNUNET_GETOPT_option_flag ('D',
"disable-extractor",
gettext_noop ("do not use libextractor to add keywords or metadata"),
&disable_extractor),
- GNUNET_GETOPT_OPTION_SET_ONE ('e',
+ GNUNET_GETOPT_option_flag ('e',
"extract",
gettext_noop ("print list of extracted keywords that would "
"be used, but do not perform upload"),
@@ -930,60 +930,60 @@ main (int argc, char *const *argv)
gettext_noop ("set the meta-data for the given TYPE to the given VALUE"),
&meta),
- GNUNET_GETOPT_OPTION_SET_ONE ('n',
+ GNUNET_GETOPT_option_flag ('n',
"noindex",
gettext_noop ("do not index, perform full insertion (stores "
"entire file in encrypted form in GNUnet database)"),
&do_insert),
- GNUNET_GETOPT_OPTION_STRING ('N',
+ GNUNET_GETOPT_option_string ('N',
"next",
"ID",
gettext_noop ("specify ID of an updated version to be "
"published in the future (for namespace insertions only)"),
&next_id),
- GNUNET_GETOPT_OPTION_SET_UINT ('p',
+ GNUNET_GETOPT_option_uint ('p',
"priority",
"PRIORITY",
gettext_noop ("specify the priority of the content"),
&bo.content_priority),
- GNUNET_GETOPT_OPTION_STRING ('P',
+ GNUNET_GETOPT_option_string ('P',
"pseudonym",
"NAME",
gettext_noop ("publish the files under the pseudonym "
"NAME (place file into namespace)"),
&pseudonym),
- GNUNET_GETOPT_OPTION_SET_UINT ('r',
+ GNUNET_GETOPT_option_uint ('r',
"replication",
"LEVEL",
gettext_noop ("set the desired replication LEVEL"),
&bo.replication_level),
- GNUNET_GETOPT_OPTION_SET_ONE ('s',
+ GNUNET_GETOPT_option_flag ('s',
"simulate-only",
gettext_noop ("only simulate the process but do not do "
"any actual publishing (useful to compute URIs)"),
&do_simulate),
- GNUNET_GETOPT_OPTION_STRING ('t',
+ GNUNET_GETOPT_option_string ('t',
"this",
"ID",
gettext_noop ("set the ID of this version of the publication "
"(for namespace insertions only)"),
&this_id),
- GNUNET_GETOPT_OPTION_STRING ('u',
+ GNUNET_GETOPT_option_string ('u',
"uri",
"URI",
gettext_noop ("URI to be published (can be used instead of passing a "
"file to add keywords to the file with the respective URI)"),
&uri_string),
- GNUNET_GETOPT_OPTION_VERBOSE (&verbose),
+ GNUNET_GETOPT_option_verbose (&verbose),
GNUNET_GETOPT_OPTION_END
};
diff --git a/src/fs/gnunet-search.c b/src/fs/gnunet-search.c
index 22e790cf3..ef1743436 100644
--- a/src/fs/gnunet-search.c
+++ b/src/fs/gnunet-search.c
@@ -307,34 +307,34 @@ main (int argc, char *const *argv)
{
struct GNUNET_GETOPT_CommandLineOption options[] = {
- GNUNET_GETOPT_OPTION_SET_UINT ('a',
+ GNUNET_GETOPT_option_uint ('a',
"anonymity",
"LEVEL",
gettext_noop ("set the desired LEVEL of receiver-anonymity"),
&anonymity),
- GNUNET_GETOPT_OPTION_SET_ONE ('n',
+ GNUNET_GETOPT_option_flag ('n',
"no-network",
gettext_noop ("only search the local peer (no P2P network search)"),
&local_only),
- GNUNET_GETOPT_OPTION_STRING ('o',
+ GNUNET_GETOPT_option_string ('o',
"output",
"PREFIX",
gettext_noop ("write search results to file starting with PREFIX"),
&output_filename),
- GNUNET_GETOPT_OPTION_SET_RELATIVE_TIME ('t',
+ GNUNET_GETOPT_option_relative_time ('t',
"timeout",
"DELAY",
gettext_noop ("automatically terminate search after DELAY"),
&timeout),
- GNUNET_GETOPT_OPTION_VERBOSE (&verbose),
+ GNUNET_GETOPT_option_verbose (&verbose),
- GNUNET_GETOPT_OPTION_SET_UINT ('N',
+ GNUNET_GETOPT_option_uint ('N',
"results",
"VALUE",
gettext_noop ("automatically terminate search "
diff --git a/src/fs/gnunet-unindex.c b/src/fs/gnunet-unindex.c
index c53a85fb4..213d2b332 100644
--- a/src/fs/gnunet-unindex.c
+++ b/src/fs/gnunet-unindex.c
@@ -164,7 +164,7 @@ main (int argc, char *const *argv)
{
struct GNUNET_GETOPT_CommandLineOption options[] = {
- GNUNET_GETOPT_OPTION_VERBOSE (&verbose),
+ GNUNET_GETOPT_option_verbose (&verbose),
GNUNET_GETOPT_OPTION_END
};