aboutsummaryrefslogtreecommitdiffstats
path: root/library/cpp/charset/iconv.cpp
diff options
context:
space:
mode:
authorsvidyuk <svidyuk@yandex-team.com>2023-03-21 12:37:23 +0300
committersvidyuk <svidyuk@yandex-team.com>2023-03-21 12:37:23 +0300
commit8c039f0e189dfefc2f05e4f76c97ac5f804bb1f6 (patch)
tree4d124c9c4abad36bc898a383fb672d49d12aec79 /library/cpp/charset/iconv.cpp
parentf1303b6e66a6625241ad019ab59ef31611014c38 (diff)
downloadydb-8c039f0e189dfefc2f05e4f76c97ac5f804bb1f6.tar.gz
Don't use standalone GNU iconv in opensource
Diffstat (limited to 'library/cpp/charset/iconv.cpp')
-rw-r--r--library/cpp/charset/iconv.cpp8
1 files changed, 5 insertions, 3 deletions
diff --git a/library/cpp/charset/iconv.cpp b/library/cpp/charset/iconv.cpp
index dc604c8492..0b6dbace9e 100644
--- a/library/cpp/charset/iconv.cpp
+++ b/library/cpp/charset/iconv.cpp
@@ -5,20 +5,22 @@
using namespace NICONVPrivate;
TDescriptor::TDescriptor(const char* from, const char* to)
- : Descriptor_(libiconv_open(to, from))
+ : Descriptor_(iconv_open(to, from))
, From_(from)
, To_(to)
{
+#if defined(USE_ICONV_EXTENSIONS)
if (!Invalid()) {
int temp = 1;
libiconvctl(Descriptor_, ICONV_SET_DISCARD_ILSEQ, &temp);
}
+#endif
}
TDescriptor::~TDescriptor() {
if (!Invalid()) {
- libiconv_close(Descriptor_);
+ iconv_close(Descriptor_);
}
}
@@ -31,7 +33,7 @@ size_t NICONVPrivate::RecodeImpl(const TDescriptor& descriptor, const char* in,
char* outPtr = out;
size_t inSizeMod = inSize;
size_t outSizeMod = outSize;
- size_t res = libiconv(descriptor.Get(), &inPtr, &inSizeMod, &outPtr, &outSizeMod);
+ size_t res = iconv(descriptor.Get(), &inPtr, &inSizeMod, &outPtr, &outSizeMod);
read = inSize - inSizeMod;
written = outSize - outSizeMod;