diff options
| author | LRN <lrn1986@gmail.com> | 2012-10-30 22:12:03 +0000 |
|---|---|---|
| committer | LRN <lrn1986@gmail.com> | 2012-10-30 22:12:03 +0000 |
| commit | 9df886ed8497002e564ba018d7ceab36bfd04ddd (patch) | |
| tree | 4ce33c4fad5486af3d45ececb47aff7110ed8c74 /src/fs/fs_getopt.c | |
| parent | 3b9cf09a1fbae43883b61c9fd0d33083fa7a6b6c (diff) | |
| download | gnunet-9df886ed8497002e564ba018d7ceab36bfd04ddd.tar.gz gnunet-9df886ed8497002e564ba018d7ceab36bfd04ddd.zip | |
Fix ENABLE_NLS usage
ENABLE_NLS is for gettext only, it's not an indicator of nl_langinfo
availability.
Use unistring instead of nl_langinfo, since unistring is always there.
GNUnet supports UTF-8 now (or should support), so most conversions are
unnecessary anyway.
Diffstat (limited to 'src/fs/fs_getopt.c')
| -rw-r--r-- | src/fs/fs_getopt.c | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/src/fs/fs_getopt.c b/src/fs/fs_getopt.c index 03747742b..6cc402115 100644 --- a/src/fs/fs_getopt.c +++ b/src/fs/fs_getopt.c | |||
| @@ -139,11 +139,12 @@ GNUNET_FS_getopt_set_metadata (struct GNUNET_GETOPT_CommandLineProcessorContext | |||
| 139 | *mm = meta; | 139 | *mm = meta; |
| 140 | } | 140 | } |
| 141 | 141 | ||
| 142 | #if ENABLE_NLS | 142 | /* Use GNUNET_STRINGS_get_utf8_args() in main() to acquire utf-8-encoded |
| 143 | tmp = GNUNET_STRINGS_to_utf8 (value, strlen (value), nl_langinfo (CODESET)); | 143 | * commandline arguments, so that the following line is not needed. |
| 144 | #else | 144 | */ |
| 145 | tmp = GNUNET_STRINGS_to_utf8 (value, strlen (value), "utf-8"); | 145 | /*tmp = GNUNET_STRINGS_to_utf8 (value, strlen (value), locale_charset ());*/ |
| 146 | #endif | 146 | tmp = GNUNET_strdup (value); |
| 147 | |||
| 147 | type = EXTRACTOR_metatype_get_max (); | 148 | type = EXTRACTOR_metatype_get_max (); |
| 148 | while (type > 0) | 149 | while (type > 0) |
| 149 | { | 150 | { |