aboutsummaryrefslogtreecommitdiffstats
path: root/contrib/libs/grpc
diff options
context:
space:
mode:
authorprime <prime@yandex-team.ru>2022-02-10 16:46:00 +0300
committerDaniil Cherednik <dcherednik@yandex-team.ru>2022-02-10 16:46:00 +0300
commit3695a7cd42b74a4987d8d5a8f2e2443556998943 (patch)
treeee79ee9294a61ee00e647684b3700d0a87e102a3 /contrib/libs/grpc
parent4d8b546b89b5afc08cf3667e176271c7ba935f33 (diff)
downloadydb-3695a7cd42b74a4987d8d5a8f2e2443556998943.tar.gz
Restoring authorship annotation for <prime@yandex-team.ru>. Commit 1 of 2.
Diffstat (limited to 'contrib/libs/grpc')
-rw-r--r--contrib/libs/grpc/include/grpc/grpc.h6
-rw-r--r--contrib/libs/grpc/src/compiler/generator_helpers.h10
-rw-r--r--contrib/libs/grpc/src/core/tsi/ssl_transport_security.cc20
-rw-r--r--contrib/libs/grpc/src/python/grpcio/grpc/_cython/_cygrpc/grpc.pxi2
-rw-r--r--contrib/libs/grpc/src/python/grpcio/grpc/_cython/cygrpc.pyx4
5 files changed, 21 insertions, 21 deletions
diff --git a/contrib/libs/grpc/include/grpc/grpc.h b/contrib/libs/grpc/include/grpc/grpc.h
index 6001117521..f7f9ad68b2 100644
--- a/contrib/libs/grpc/include/grpc/grpc.h
+++ b/contrib/libs/grpc/include/grpc/grpc.h
@@ -58,9 +58,9 @@ GRPCAPI void grpc_call_details_destroy(grpc_call_details* details);
the reverse order they were initialized. */
GRPCAPI void grpc_register_plugin(void (*init)(void), void (*destroy)(void));
-GRPCAPI void grpc_init_openssl(void);
-GRPCAPI void grpc_dont_init_openssl(void);
-
+GRPCAPI void grpc_init_openssl(void);
+GRPCAPI void grpc_dont_init_openssl(void);
+
/** Initialize the grpc library.
After it's called, a matching invocation to grpc_shutdown() is expected.
diff --git a/contrib/libs/grpc/src/compiler/generator_helpers.h b/contrib/libs/grpc/src/compiler/generator_helpers.h
index 265713a16b..64d98e722d 100644
--- a/contrib/libs/grpc/src/compiler/generator_helpers.h
+++ b/contrib/libs/grpc/src/compiler/generator_helpers.h
@@ -26,7 +26,7 @@
#include <vector>
#include <util/generic/string.h>
-#include <util/string/split.h>
+#include <util/string/split.h>
#include <util/stream/str.h>
#include "src/compiler/config.h"
@@ -183,10 +183,10 @@ inline void Split(const TStringType& s, char /*delim*/,
template <>
inline void Split(const TString &s, char delim,
std::vector<TString> *append_to) {
- TVector<TString> parts;
- Split(s, TString(1, delim), parts);
- for (auto& p : parts) {
- append_to->push_back(std::move(p));
+ TVector<TString> parts;
+ Split(s, TString(1, delim), parts);
+ for (auto& p : parts) {
+ append_to->push_back(std::move(p));
}
}
diff --git a/contrib/libs/grpc/src/core/tsi/ssl_transport_security.cc b/contrib/libs/grpc/src/core/tsi/ssl_transport_security.cc
index 374f8e583f..963cdfe7d4 100644
--- a/contrib/libs/grpc/src/core/tsi/ssl_transport_security.cc
+++ b/contrib/libs/grpc/src/core/tsi/ssl_transport_security.cc
@@ -189,16 +189,16 @@ static void init_openssl(void) {
GPR_ASSERT(g_ssl_ctx_ex_factory_index != -1);
}
-static void do_nothing(void) {}
-
-extern "C" void grpc_dont_init_openssl(void) {
- gpr_once_init(&g_init_openssl_once, do_nothing);
-}
-
-extern "C" void grpc_init_openssl(void) {
- gpr_once_init(&g_init_openssl_once, init_openssl);
-}
-
+static void do_nothing(void) {}
+
+extern "C" void grpc_dont_init_openssl(void) {
+ gpr_once_init(&g_init_openssl_once, do_nothing);
+}
+
+extern "C" void grpc_init_openssl(void) {
+ gpr_once_init(&g_init_openssl_once, init_openssl);
+}
+
/* --- Ssl utils. ---*/
static const char* ssl_error_string(int error) {
diff --git a/contrib/libs/grpc/src/python/grpcio/grpc/_cython/_cygrpc/grpc.pxi b/contrib/libs/grpc/src/python/grpcio/grpc/_cython/_cygrpc/grpc.pxi
index 54eb7fdffc..e004943303 100644
--- a/contrib/libs/grpc/src/python/grpcio/grpc/_cython/_cygrpc/grpc.pxi
+++ b/contrib/libs/grpc/src/python/grpcio/grpc/_cython/_cygrpc/grpc.pxi
@@ -333,7 +333,7 @@ cdef extern from "grpc/grpc.h":
void * reserved
grpc_op_data data
- void grpc_dont_init_openssl() nogil
+ void grpc_dont_init_openssl() nogil
void grpc_init() nogil
void grpc_shutdown_blocking() nogil
int grpc_is_initialized() nogil
diff --git a/contrib/libs/grpc/src/python/grpcio/grpc/_cython/cygrpc.pyx b/contrib/libs/grpc/src/python/grpcio/grpc/_cython/cygrpc.pyx
index 8d355c6fbb..a983081018 100644
--- a/contrib/libs/grpc/src/python/grpcio/grpc/_cython/cygrpc.pyx
+++ b/contrib/libs/grpc/src/python/grpcio/grpc/_cython/cygrpc.pyx
@@ -92,8 +92,8 @@ cdef _initialize():
# We have Python callbacks called by c-core threads, this ensures the GIL
# is initialized.
PyEval_InitThreads()
- import ssl
- grpc_dont_init_openssl()
+ import ssl
+ grpc_dont_init_openssl()
# Load Arcadia certs in ComputePemRootCerts and do not override here.
_initialize()