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/namestore | |
| 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/namestore')
| -rw-r--r-- | src/namestore/plugin_namestore_sqlite.c | 9 |
1 files changed, 2 insertions, 7 deletions
diff --git a/src/namestore/plugin_namestore_sqlite.c b/src/namestore/plugin_namestore_sqlite.c index 477e7bb16..f0deb7fa9 100644 --- a/src/namestore/plugin_namestore_sqlite.c +++ b/src/namestore/plugin_namestore_sqlite.c | |||
| @@ -213,13 +213,8 @@ database_setup (struct Plugin *plugin) | |||
| 213 | return GNUNET_SYSERR; | 213 | return GNUNET_SYSERR; |
| 214 | } | 214 | } |
| 215 | } | 215 | } |
| 216 | #ifdef ENABLE_NLS | 216 | /* afsdir should be UTF-8-encoded. If it isn't, it's a bug */ |
| 217 | plugin->fn = | 217 | plugin->fn = afsdir; |
| 218 | GNUNET_STRINGS_to_utf8 (afsdir, strlen (afsdir), nl_langinfo (CODESET)); | ||
| 219 | #else | ||
| 220 | plugin->fn = GNUNET_STRINGS_to_utf8 (afsdir, strlen (afsdir), "UTF-8"); /* good luck */ | ||
| 221 | #endif | ||
| 222 | GNUNET_free (afsdir); | ||
| 223 | 218 | ||
| 224 | /* Open database and precompile statements */ | 219 | /* Open database and precompile statements */ |
| 225 | if (sqlite3_open (plugin->fn, &plugin->dbh) != SQLITE_OK) | 220 | if (sqlite3_open (plugin->fn, &plugin->dbh) != SQLITE_OK) |