aboutsummaryrefslogtreecommitdiffstats
path: root/contrib
diff options
context:
space:
mode:
authoreninng <eninng@yandex-team.ru>2022-02-10 16:47:08 +0300
committerDaniil Cherednik <dcherednik@yandex-team.ru>2022-02-10 16:47:08 +0300
commit91aa870864e227f2f6d404c5892aefb771b5c8db (patch)
treeb83306b6e37edeea782e9eed673d89286c4fef35 /contrib
parent83de44964eb30cab9f4750ec5113837b79d73f76 (diff)
downloadydb-91aa870864e227f2f6d404c5892aefb771b5c8db.tar.gz
Restoring authorship annotation for <eninng@yandex-team.ru>. Commit 2 of 2.
Diffstat (limited to 'contrib')
-rw-r--r--contrib/libs/libc_compat/string.h2
-rw-r--r--contrib/libs/libc_compat/ya.make30
-rw-r--r--contrib/libs/libxml/dynamic/ya.make2
-rw-r--r--contrib/libs/libxml/encoding.c14
-rw-r--r--contrib/libs/libxml/ya.make34
-rw-r--r--contrib/libs/ya.make2
6 files changed, 42 insertions, 42 deletions
diff --git a/contrib/libs/libc_compat/string.h b/contrib/libs/libc_compat/string.h
index 6e05661c36..ad74d9a630 100644
--- a/contrib/libs/libc_compat/string.h
+++ b/contrib/libs/libc_compat/string.h
@@ -13,7 +13,7 @@ size_t strlcpy(char* dst, const char* src, size_t len);
size_t strlcat(char* dst, const char* src, size_t len);
#endif
-#if (!defined(__linux__) && !defined(__FreeBSD__) && !defined(__APPLE__)) || (defined(__ANDROID__) && __ANDROID_API__ < 21)
+#if (!defined(__linux__) && !defined(__FreeBSD__) && !defined(__APPLE__)) || (defined(__ANDROID__) && __ANDROID_API__ < 21)
char* stpcpy(char* dst, const char* src);
#endif
diff --git a/contrib/libs/libc_compat/ya.make b/contrib/libs/libc_compat/ya.make
index bef08e7e67..b92184c165 100644
--- a/contrib/libs/libc_compat/ya.make
+++ b/contrib/libs/libc_compat/ya.make
@@ -17,20 +17,20 @@ NO_UTIL()
NO_RUNTIME()
-IF (NOT OS_WINDOWS)
+IF (NOT OS_WINDOWS)
SRCS(
- string.c
+ string.c
)
-ENDIF()
-
+ENDIF()
+
# Android libc function appearance is documented here:
# https://android.googlesource.com/platform/bionic/+/master/docs/status.md
#
# NB: nested IF's are needed due to the lack of lazy evaluation of logical statements: DEVTOOLS-7837
-IF (OS_ANDROID)
+IF (OS_ANDROID)
SRCS(
- strlcat.c
- strlcpy.c
+ strlcat.c
+ strlcpy.c
)
IF (ANDROID_API < 28)
SRCS(
@@ -46,11 +46,11 @@ IF (OS_ANDROID)
GLOBAL contrib/libs/libc_compat/include/ifaddrs
)
ENDIF()
- IF (ANDROID_API < 21)
- SRCS(
- stpcpy.c
- )
- ENDIF()
+ IF (ANDROID_API < 21)
+ SRCS(
+ stpcpy.c
+ )
+ ENDIF()
ENDIF()
IF (OS_WINDOWS OR OS_DARWIN OR OS_IOS)
@@ -71,9 +71,9 @@ IF (OS_WINDOWS)
)
SRCS(
reallocarray.c
- stpcpy.c
- strlcat.c
- strlcpy.c
+ stpcpy.c
+ strlcat.c
+ strlcpy.c
strcasestr.c
strsep.c
src/windows/sys/uio.c
diff --git a/contrib/libs/libxml/dynamic/ya.make b/contrib/libs/libxml/dynamic/ya.make
index 0a0fe68028..05f475d1e1 100644
--- a/contrib/libs/libxml/dynamic/ya.make
+++ b/contrib/libs/libxml/dynamic/ya.make
@@ -1,5 +1,5 @@
# Generated by devtools/yamaker.
-OWNER(g:cpp-contrib g:yandex_io)
+OWNER(g:cpp-contrib g:yandex_io)
DLL_FOR(contrib/libs/libxml libxml EXPORTS libxml2.syms)
diff --git a/contrib/libs/libxml/encoding.c b/contrib/libs/libxml/encoding.c
index 9fba69b76c..89ac8dd2c9 100644
--- a/contrib/libs/libxml/encoding.c
+++ b/contrib/libs/libxml/encoding.c
@@ -44,10 +44,10 @@
#endif
#include <libxml/globals.h>
#include <libxml/xmlerror.h>
-
-#ifndef ARCADIA_LIBXML_DISABLE_EXTRA_ENCODINGS
+
+#ifndef ARCADIA_LIBXML_DISABLE_EXTRA_ENCODINGS
#include "yencoding.h"
-#endif
+#endif
#include "buf.h"
#include "enc.h"
@@ -1428,12 +1428,12 @@ xmlInitCharEncodingHandlers(void) {
xmlNewCharEncodingHandler("ISO-8859-1", isolat1ToUTF8, UTF8Toisolat1);
xmlNewCharEncodingHandler("ASCII", asciiToUTF8, UTF8Toascii);
xmlNewCharEncodingHandler("US-ASCII", asciiToUTF8, UTF8Toascii);
-
-#ifndef ARCADIA_LIBXML_DISABLE_EXTRA_ENCODINGS
+
+#ifndef ARCADIA_LIBXML_DISABLE_EXTRA_ENCODINGS
xmlNewCharEncodingHandler("windows-1251", win1251ToUTF8, UTF8Towin1251);
xmlNewCharEncodingHandler("koi8-r", koi8ToUTF8, UTF8Tokoi8);
-#endif
-
+#endif
+
#ifdef LIBXML_HTML_ENABLED
xmlNewCharEncodingHandler("HTML", NULL, UTF8ToHtml);
#endif
diff --git a/contrib/libs/libxml/ya.make b/contrib/libs/libxml/ya.make
index aa6effa07a..b7ee2eb058 100644
--- a/contrib/libs/libxml/ya.make
+++ b/contrib/libs/libxml/ya.make
@@ -2,10 +2,10 @@
LIBRARY()
-OWNER(
- g:cpp-contrib
- g:yandex_io
-)
+OWNER(
+ g:cpp-contrib
+ g:yandex_io
+)
VERSION(2.9.10)
@@ -84,17 +84,17 @@ SRCS(
xzlib.c
)
-IF (ARCADIA_LIBXML_DISABLE_EXTRA_ENCODINGS)
- CFLAGS(
- -DARCADIA_LIBXML_DISABLE_EXTRA_ENCODINGS
- )
-ELSE()
- PEERDIR(
- library/cpp/charset
- )
- SRCS(
- yencoding.cpp
- )
-ENDIF()
-
+IF (ARCADIA_LIBXML_DISABLE_EXTRA_ENCODINGS)
+ CFLAGS(
+ -DARCADIA_LIBXML_DISABLE_EXTRA_ENCODINGS
+ )
+ELSE()
+ PEERDIR(
+ library/cpp/charset
+ )
+ SRCS(
+ yencoding.cpp
+ )
+ENDIF()
+
END()
diff --git a/contrib/libs/ya.make b/contrib/libs/ya.make
index e3a28255ad..9c4640fdcf 100644
--- a/contrib/libs/ya.make
+++ b/contrib/libs/ya.make
@@ -178,7 +178,7 @@ RECURSE(
librdkafka
librosa-cpp
librsvg
- libsamplerate
+ libsamplerate
libsavi
libsodium
libspf2