diff options
Diffstat (limited to 'src/fs')
-rw-r--r-- | src/fs/gnunet-auto-share.c | 12 | ||||
-rw-r--r-- | src/fs/gnunet-download.c | 16 | ||||
-rw-r--r-- | src/fs/gnunet-fs-profiler.c | 6 | ||||
-rw-r--r-- | src/fs/gnunet-fs.c | 4 | ||||
-rw-r--r-- | src/fs/gnunet-publish.c | 26 | ||||
-rw-r--r-- | src/fs/gnunet-search.c | 12 | ||||
-rw-r--r-- | src/fs/gnunet-unindex.c | 2 |
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) | |||
761 | { | 761 | { |
762 | struct GNUNET_GETOPT_CommandLineOption options[] = { | 762 | struct GNUNET_GETOPT_CommandLineOption options[] = { |
763 | 763 | ||
764 | GNUNET_GETOPT_OPTION_SET_UINT ('a', | 764 | GNUNET_GETOPT_option_uint ('a', |
765 | "anonymity", | 765 | "anonymity", |
766 | "LEVEL", | 766 | "LEVEL", |
767 | gettext_noop ("set the desired LEVEL of sender-anonymity"), | 767 | gettext_noop ("set the desired LEVEL of sender-anonymity"), |
768 | &anonymity_level), | 768 | &anonymity_level), |
769 | 769 | ||
770 | GNUNET_GETOPT_OPTION_SET_ONE ('d', | 770 | GNUNET_GETOPT_option_flag ('d', |
771 | "disable-creation-time", | 771 | "disable-creation-time", |
772 | gettext_noop ("disable adding the creation time to the metadata of the uploaded file"), | 772 | gettext_noop ("disable adding the creation time to the metadata of the uploaded file"), |
773 | &do_disable_creation_time), | 773 | &do_disable_creation_time), |
774 | 774 | ||
775 | GNUNET_GETOPT_OPTION_SET_ONE ('D', | 775 | GNUNET_GETOPT_option_flag ('D', |
776 | "disable-extractor", | 776 | "disable-extractor", |
777 | gettext_noop ("do not use libextractor to add keywords or metadata"), | 777 | gettext_noop ("do not use libextractor to add keywords or metadata"), |
778 | &disable_extractor), | 778 | &disable_extractor), |
779 | 779 | ||
780 | GNUNET_GETOPT_OPTION_SET_UINT ('p', | 780 | GNUNET_GETOPT_option_uint ('p', |
781 | "priority", | 781 | "priority", |
782 | "PRIORITY", | 782 | "PRIORITY", |
783 | gettext_noop ("specify the priority of the content"), | 783 | gettext_noop ("specify the priority of the content"), |
784 | &content_priority), | 784 | &content_priority), |
785 | 785 | ||
786 | GNUNET_GETOPT_OPTION_SET_UINT ('r', | 786 | GNUNET_GETOPT_option_uint ('r', |
787 | "replication", | 787 | "replication", |
788 | "LEVEL", | 788 | "LEVEL", |
789 | gettext_noop ("set the desired replication LEVEL"), | 789 | gettext_noop ("set the desired replication LEVEL"), |
790 | &replication_level), | 790 | &replication_level), |
791 | 791 | ||
792 | GNUNET_GETOPT_OPTION_VERBOSE (&verbose), | 792 | GNUNET_GETOPT_option_verbose (&verbose), |
793 | 793 | ||
794 | GNUNET_GETOPT_OPTION_END | 794 | GNUNET_GETOPT_OPTION_END |
795 | }; | 795 | }; |
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 | |||
300 | main (int argc, char *const *argv) | 300 | main (int argc, char *const *argv) |
301 | { | 301 | { |
302 | struct GNUNET_GETOPT_CommandLineOption options[] = { | 302 | struct GNUNET_GETOPT_CommandLineOption options[] = { |
303 | GNUNET_GETOPT_OPTION_SET_UINT ('a', | 303 | GNUNET_GETOPT_option_uint ('a', |
304 | "anonymity", | 304 | "anonymity", |
305 | "LEVEL", | 305 | "LEVEL", |
306 | gettext_noop ("set the desired LEVEL of receiver-anonymity"), | 306 | gettext_noop ("set the desired LEVEL of receiver-anonymity"), |
307 | &anonymity), | 307 | &anonymity), |
308 | 308 | ||
309 | GNUNET_GETOPT_OPTION_SET_ONE ('D', | 309 | GNUNET_GETOPT_option_flag ('D', |
310 | "delete-incomplete", | 310 | "delete-incomplete", |
311 | gettext_noop ("delete incomplete downloads (when aborted with CTRL-C)"), | 311 | gettext_noop ("delete incomplete downloads (when aborted with CTRL-C)"), |
312 | &delete_incomplete), | 312 | &delete_incomplete), |
313 | 313 | ||
314 | GNUNET_GETOPT_OPTION_SET_ONE ('n', | 314 | GNUNET_GETOPT_option_flag ('n', |
315 | "no-network", | 315 | "no-network", |
316 | gettext_noop ("only search the local peer (no P2P network search)"), | 316 | gettext_noop ("only search the local peer (no P2P network search)"), |
317 | &local_only), | 317 | &local_only), |
318 | 318 | ||
319 | GNUNET_GETOPT_OPTION_STRING ('o', | 319 | GNUNET_GETOPT_option_string ('o', |
320 | "output", | 320 | "output", |
321 | "FILENAME", | 321 | "FILENAME", |
322 | gettext_noop ("write the file to FILENAME"), | 322 | gettext_noop ("write the file to FILENAME"), |
323 | &filename), | 323 | &filename), |
324 | 324 | ||
325 | GNUNET_GETOPT_OPTION_SET_UINT ('p', | 325 | GNUNET_GETOPT_option_uint ('p', |
326 | "parallelism", | 326 | "parallelism", |
327 | "DOWNLOADS", | 327 | "DOWNLOADS", |
328 | gettext_noop ("set the maximum number of parallel downloads that is allowed"), | 328 | gettext_noop ("set the maximum number of parallel downloads that is allowed"), |
329 | ¶llelism), | 329 | ¶llelism), |
330 | 330 | ||
331 | GNUNET_GETOPT_OPTION_SET_UINT ('r', | 331 | GNUNET_GETOPT_option_uint ('r', |
332 | "request-parallelism", | 332 | "request-parallelism", |
333 | "REQUESTS", | 333 | "REQUESTS", |
334 | gettext_noop ("set the maximum number of parallel requests for blocks that is allowed"), | 334 | gettext_noop ("set the maximum number of parallel requests for blocks that is allowed"), |
335 | &request_parallelism), | 335 | &request_parallelism), |
336 | 336 | ||
337 | GNUNET_GETOPT_OPTION_SET_ONE ('R', | 337 | GNUNET_GETOPT_option_flag ('R', |
338 | "recursive", | 338 | "recursive", |
339 | gettext_noop ("download a GNUnet directory recursively"), | 339 | gettext_noop ("download a GNUnet directory recursively"), |
340 | &do_recursive), | 340 | &do_recursive), |
341 | 341 | ||
342 | GNUNET_GETOPT_OPTION_INCREMENT_VALUE ('V', | 342 | GNUNET_GETOPT_option_increment_uint ('V', |
343 | "verbose", | 343 | "verbose", |
344 | gettext_noop ("be verbose (print progress information)"), | 344 | gettext_noop ("be verbose (print progress information)"), |
345 | &verbose), | 345 | &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) | |||
205 | { | 205 | { |
206 | struct GNUNET_GETOPT_CommandLineOption options[] = { | 206 | struct GNUNET_GETOPT_CommandLineOption options[] = { |
207 | 207 | ||
208 | GNUNET_GETOPT_OPTION_SET_UINT ('n', | 208 | GNUNET_GETOPT_option_uint ('n', |
209 | "num-peers", | 209 | "num-peers", |
210 | "COUNT", | 210 | "COUNT", |
211 | gettext_noop ("run the experiment with COUNT peers"), | 211 | gettext_noop ("run the experiment with COUNT peers"), |
212 | &num_peers), | 212 | &num_peers), |
213 | 213 | ||
214 | GNUNET_GETOPT_OPTION_STRING ('H', | 214 | GNUNET_GETOPT_option_string ('H', |
215 | "hosts", | 215 | "hosts", |
216 | "HOSTFILE", | 216 | "HOSTFILE", |
217 | gettext_noop ("specifies name of a file with the HOSTS the testbed should use"), | 217 | gettext_noop ("specifies name of a file with the HOSTS the testbed should use"), |
218 | &host_filename), | 218 | &host_filename), |
219 | 219 | ||
220 | GNUNET_GETOPT_OPTION_SET_RELATIVE_TIME ('t', | 220 | GNUNET_GETOPT_option_relative_time ('t', |
221 | "timeout", | 221 | "timeout", |
222 | "DELAY", | 222 | "DELAY", |
223 | gettext_noop ("automatically terminate experiment after DELAY"), | 223 | 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) | |||
114 | { | 114 | { |
115 | struct GNUNET_GETOPT_CommandLineOption options[] = { | 115 | struct GNUNET_GETOPT_CommandLineOption options[] = { |
116 | 116 | ||
117 | GNUNET_GETOPT_OPTION_SET_ONE ('i', | 117 | GNUNET_GETOPT_option_flag ('i', |
118 | "list-indexed", | 118 | "list-indexed", |
119 | gettext_noop ("print a list of all indexed files"), | 119 | gettext_noop ("print a list of all indexed files"), |
120 | &list_indexed_files), | 120 | &list_indexed_files), |
121 | 121 | ||
122 | GNUNET_GETOPT_OPTION_VERBOSE (&verbose), | 122 | GNUNET_GETOPT_option_verbose (&verbose), |
123 | GNUNET_GETOPT_OPTION_END | 123 | GNUNET_GETOPT_OPTION_END |
124 | }; | 124 | }; |
125 | 125 | ||
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 | |||
894 | main (int argc, char *const *argv) | 894 | main (int argc, char *const *argv) |
895 | { | 895 | { |
896 | struct GNUNET_GETOPT_CommandLineOption options[] = { | 896 | struct GNUNET_GETOPT_CommandLineOption options[] = { |
897 | GNUNET_GETOPT_OPTION_SET_UINT ('a', | 897 | GNUNET_GETOPT_option_uint ('a', |
898 | "anonymity", | 898 | "anonymity", |
899 | "LEVEL", | 899 | "LEVEL", |
900 | gettext_noop ("set the desired LEVEL of sender-anonymity"), | 900 | gettext_noop ("set the desired LEVEL of sender-anonymity"), |
901 | &bo.anonymity_level), | 901 | &bo.anonymity_level), |
902 | 902 | ||
903 | GNUNET_GETOPT_OPTION_SET_ONE ('d', | 903 | GNUNET_GETOPT_option_flag ('d', |
904 | "disable-creation-time", | 904 | "disable-creation-time", |
905 | gettext_noop ("disable adding the creation time to the " | 905 | gettext_noop ("disable adding the creation time to the " |
906 | "metadata of the uploaded file"), | 906 | "metadata of the uploaded file"), |
907 | &do_disable_creation_time), | 907 | &do_disable_creation_time), |
908 | 908 | ||
909 | GNUNET_GETOPT_OPTION_SET_ONE ('D', | 909 | GNUNET_GETOPT_option_flag ('D', |
910 | "disable-extractor", | 910 | "disable-extractor", |
911 | gettext_noop ("do not use libextractor to add keywords or metadata"), | 911 | gettext_noop ("do not use libextractor to add keywords or metadata"), |
912 | &disable_extractor), | 912 | &disable_extractor), |
913 | 913 | ||
914 | GNUNET_GETOPT_OPTION_SET_ONE ('e', | 914 | GNUNET_GETOPT_option_flag ('e', |
915 | "extract", | 915 | "extract", |
916 | gettext_noop ("print list of extracted keywords that would " | 916 | gettext_noop ("print list of extracted keywords that would " |
917 | "be used, but do not perform upload"), | 917 | "be used, but do not perform upload"), |
@@ -930,60 +930,60 @@ main (int argc, char *const *argv) | |||
930 | gettext_noop ("set the meta-data for the given TYPE to the given VALUE"), | 930 | gettext_noop ("set the meta-data for the given TYPE to the given VALUE"), |
931 | &meta), | 931 | &meta), |
932 | 932 | ||
933 | GNUNET_GETOPT_OPTION_SET_ONE ('n', | 933 | GNUNET_GETOPT_option_flag ('n', |
934 | "noindex", | 934 | "noindex", |
935 | gettext_noop ("do not index, perform full insertion (stores " | 935 | gettext_noop ("do not index, perform full insertion (stores " |
936 | "entire file in encrypted form in GNUnet database)"), | 936 | "entire file in encrypted form in GNUnet database)"), |
937 | &do_insert), | 937 | &do_insert), |
938 | 938 | ||
939 | GNUNET_GETOPT_OPTION_STRING ('N', | 939 | GNUNET_GETOPT_option_string ('N', |
940 | "next", | 940 | "next", |
941 | "ID", | 941 | "ID", |
942 | gettext_noop ("specify ID of an updated version to be " | 942 | gettext_noop ("specify ID of an updated version to be " |
943 | "published in the future (for namespace insertions only)"), | 943 | "published in the future (for namespace insertions only)"), |
944 | &next_id), | 944 | &next_id), |
945 | 945 | ||
946 | GNUNET_GETOPT_OPTION_SET_UINT ('p', | 946 | GNUNET_GETOPT_option_uint ('p', |
947 | "priority", | 947 | "priority", |
948 | "PRIORITY", | 948 | "PRIORITY", |
949 | gettext_noop ("specify the priority of the content"), | 949 | gettext_noop ("specify the priority of the content"), |
950 | &bo.content_priority), | 950 | &bo.content_priority), |
951 | 951 | ||
952 | GNUNET_GETOPT_OPTION_STRING ('P', | 952 | GNUNET_GETOPT_option_string ('P', |
953 | "pseudonym", | 953 | "pseudonym", |
954 | "NAME", | 954 | "NAME", |
955 | gettext_noop ("publish the files under the pseudonym " | 955 | gettext_noop ("publish the files under the pseudonym " |
956 | "NAME (place file into namespace)"), | 956 | "NAME (place file into namespace)"), |
957 | &pseudonym), | 957 | &pseudonym), |
958 | 958 | ||
959 | GNUNET_GETOPT_OPTION_SET_UINT ('r', | 959 | GNUNET_GETOPT_option_uint ('r', |
960 | "replication", | 960 | "replication", |
961 | "LEVEL", | 961 | "LEVEL", |
962 | gettext_noop ("set the desired replication LEVEL"), | 962 | gettext_noop ("set the desired replication LEVEL"), |
963 | &bo.replication_level), | 963 | &bo.replication_level), |
964 | 964 | ||
965 | 965 | ||
966 | GNUNET_GETOPT_OPTION_SET_ONE ('s', | 966 | GNUNET_GETOPT_option_flag ('s', |
967 | "simulate-only", | 967 | "simulate-only", |
968 | gettext_noop ("only simulate the process but do not do " | 968 | gettext_noop ("only simulate the process but do not do " |
969 | "any actual publishing (useful to compute URIs)"), | 969 | "any actual publishing (useful to compute URIs)"), |
970 | &do_simulate), | 970 | &do_simulate), |
971 | 971 | ||
972 | GNUNET_GETOPT_OPTION_STRING ('t', | 972 | GNUNET_GETOPT_option_string ('t', |
973 | "this", | 973 | "this", |
974 | "ID", | 974 | "ID", |
975 | gettext_noop ("set the ID of this version of the publication " | 975 | gettext_noop ("set the ID of this version of the publication " |
976 | "(for namespace insertions only)"), | 976 | "(for namespace insertions only)"), |
977 | &this_id), | 977 | &this_id), |
978 | 978 | ||
979 | GNUNET_GETOPT_OPTION_STRING ('u', | 979 | GNUNET_GETOPT_option_string ('u', |
980 | "uri", | 980 | "uri", |
981 | "URI", | 981 | "URI", |
982 | gettext_noop ("URI to be published (can be used instead of passing a " | 982 | gettext_noop ("URI to be published (can be used instead of passing a " |
983 | "file to add keywords to the file with the respective URI)"), | 983 | "file to add keywords to the file with the respective URI)"), |
984 | &uri_string), | 984 | &uri_string), |
985 | 985 | ||
986 | GNUNET_GETOPT_OPTION_VERBOSE (&verbose), | 986 | GNUNET_GETOPT_option_verbose (&verbose), |
987 | 987 | ||
988 | GNUNET_GETOPT_OPTION_END | 988 | GNUNET_GETOPT_OPTION_END |
989 | }; | 989 | }; |
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) | |||
307 | { | 307 | { |
308 | struct GNUNET_GETOPT_CommandLineOption options[] = { | 308 | struct GNUNET_GETOPT_CommandLineOption options[] = { |
309 | 309 | ||
310 | GNUNET_GETOPT_OPTION_SET_UINT ('a', | 310 | GNUNET_GETOPT_option_uint ('a', |
311 | "anonymity", | 311 | "anonymity", |
312 | "LEVEL", | 312 | "LEVEL", |
313 | gettext_noop ("set the desired LEVEL of receiver-anonymity"), | 313 | gettext_noop ("set the desired LEVEL of receiver-anonymity"), |
314 | &anonymity), | 314 | &anonymity), |
315 | 315 | ||
316 | 316 | ||
317 | GNUNET_GETOPT_OPTION_SET_ONE ('n', | 317 | GNUNET_GETOPT_option_flag ('n', |
318 | "no-network", | 318 | "no-network", |
319 | gettext_noop ("only search the local peer (no P2P network search)"), | 319 | gettext_noop ("only search the local peer (no P2P network search)"), |
320 | &local_only), | 320 | &local_only), |
321 | 321 | ||
322 | GNUNET_GETOPT_OPTION_STRING ('o', | 322 | GNUNET_GETOPT_option_string ('o', |
323 | "output", | 323 | "output", |
324 | "PREFIX", | 324 | "PREFIX", |
325 | gettext_noop ("write search results to file starting with PREFIX"), | 325 | gettext_noop ("write search results to file starting with PREFIX"), |
326 | &output_filename), | 326 | &output_filename), |
327 | 327 | ||
328 | GNUNET_GETOPT_OPTION_SET_RELATIVE_TIME ('t', | 328 | GNUNET_GETOPT_option_relative_time ('t', |
329 | "timeout", | 329 | "timeout", |
330 | "DELAY", | 330 | "DELAY", |
331 | gettext_noop ("automatically terminate search after DELAY"), | 331 | gettext_noop ("automatically terminate search after DELAY"), |
332 | &timeout), | 332 | &timeout), |
333 | 333 | ||
334 | 334 | ||
335 | GNUNET_GETOPT_OPTION_VERBOSE (&verbose), | 335 | GNUNET_GETOPT_option_verbose (&verbose), |
336 | 336 | ||
337 | GNUNET_GETOPT_OPTION_SET_UINT ('N', | 337 | GNUNET_GETOPT_option_uint ('N', |
338 | "results", | 338 | "results", |
339 | "VALUE", | 339 | "VALUE", |
340 | gettext_noop ("automatically terminate search " | 340 | 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) | |||
164 | { | 164 | { |
165 | struct GNUNET_GETOPT_CommandLineOption options[] = { | 165 | struct GNUNET_GETOPT_CommandLineOption options[] = { |
166 | 166 | ||
167 | GNUNET_GETOPT_OPTION_VERBOSE (&verbose), | 167 | GNUNET_GETOPT_option_verbose (&verbose), |
168 | 168 | ||
169 | GNUNET_GETOPT_OPTION_END | 169 | GNUNET_GETOPT_OPTION_END |
170 | }; | 170 | }; |