diff options
author | Christian Grothoff <christian@grothoff.org> | 2009-08-07 18:18:56 +0000 |
---|---|---|
committer | Christian Grothoff <christian@grothoff.org> | 2009-08-07 18:18:56 +0000 |
commit | 645767a8803ddfee212fc77bc80dd35fe2be1b0a (patch) | |
tree | bcb7c4c1c372e4f09189b681b3c9486a18c8926d /src/fs/fs_getopt.c | |
parent | b80e650bad570e01b5600aab2a667d177fc17770 (diff) | |
download | gnunet-645767a8803ddfee212fc77bc80dd35fe2be1b0a.tar.gz gnunet-645767a8803ddfee212fc77bc80dd35fe2be1b0a.zip |
hxing
Diffstat (limited to 'src/fs/fs_getopt.c')
-rw-r--r-- | src/fs/fs_getopt.c | 15 |
1 files changed, 7 insertions, 8 deletions
diff --git a/src/fs/fs_getopt.c b/src/fs/fs_getopt.c index 8afe49852..dfcc4fdc4 100644 --- a/src/fs/fs_getopt.c +++ b/src/fs/fs_getopt.c | |||
@@ -24,11 +24,10 @@ | |||
24 | * @author Igor Wronsky, Christian Grothoff | 24 | * @author Igor Wronsky, Christian Grothoff |
25 | */ | 25 | */ |
26 | #include "platform.h" | 26 | #include "platform.h" |
27 | #include "gnunet_fs_lib.h" | 27 | #include "gnunet_fs_service.h" |
28 | #include "fs.h" | ||
28 | 29 | ||
29 | 30 | /* ******************** command-line option parsing API ******************** */ | |
30 | |||
31 | /* ******************** command-line option parsing API *********************** */ | ||
32 | 31 | ||
33 | /** | 32 | /** |
34 | * Command-line option parser function that allows the user | 33 | * Command-line option parser function that allows the user |
@@ -43,7 +42,7 @@ | |||
43 | * @return GNUNET_OK on success | 42 | * @return GNUNET_OK on success |
44 | */ | 43 | */ |
45 | int | 44 | int |
46 | GNUNET_FS_getopt_configure_set_keywords (GNUNET_GETOPT_CommandLineProcessorContext* ctx, | 45 | GNUNET_FS_getopt_configure_set_keywords (struct GNUNET_GETOPT_CommandLineProcessorContext* ctx, |
47 | void *scls, | 46 | void *scls, |
48 | const char *option, | 47 | const char *option, |
49 | const char *value) | 48 | const char *value) |
@@ -55,7 +54,7 @@ GNUNET_FS_getopt_configure_set_keywords (GNUNET_GETOPT_CommandLineProcessorConte | |||
55 | 54 | ||
56 | if (u == NULL) | 55 | if (u == NULL) |
57 | { | 56 | { |
58 | u = GNUNET_malloc (sizeof (struct GNUNET_ECRS_URI)); | 57 | u = GNUNET_malloc (sizeof (struct GNUNET_FS_Uri)); |
59 | *uri = u; | 58 | *uri = u; |
60 | u->type = ksk; | 59 | u->type = ksk; |
61 | u->data.ksk.keywordCount = 0; | 60 | u->data.ksk.keywordCount = 0; |
@@ -125,7 +124,7 @@ GNUNET_FS_getopt_configure_set_keywords (GNUNET_GETOPT_CommandLineProcessorConte | |||
125 | * @return GNUNET_OK on success | 124 | * @return GNUNET_OK on success |
126 | */ | 125 | */ |
127 | int | 126 | int |
128 | GNUNET_FS_getopt_configure_set_metadata (GNUNET_GETOPT_CommandLineProcessorContext* ctx, | 127 | GNUNET_FS_getopt_configure_set_metadata (struct GNUNET_GETOPT_CommandLineProcessorContext* ctx, |
129 | void *scls, | 128 | void *scls, |
130 | const char *option, | 129 | const char *option, |
131 | const char *value) | 130 | const char *value) |
@@ -145,7 +144,7 @@ GNUNET_FS_getopt_configure_set_metadata (GNUNET_GETOPT_CommandLineProcessorConte | |||
145 | *mm = meta; | 144 | *mm = meta; |
146 | } | 145 | } |
147 | 146 | ||
148 | tmp = GNUNET_STRINGS_to_utf8 (NULL, value, strlen (value), | 147 | tmp = GNUNET_STRINGS_to_utf8 (value, strlen (value), |
149 | #if ENABLE_NLS | 148 | #if ENABLE_NLS |
150 | nl_langinfo (CODESET) | 149 | nl_langinfo (CODESET) |
151 | #else | 150 | #else |