From 65c9ece1398d73387f5a2314d88cf2e12d3efe82 Mon Sep 17 00:00:00 2001 From: Matthew Stevenson Date: Wed, 18 Sep 2019 15:00:37 -0700 Subject: [PATCH] Forgot to run clang_format after previous build changes. --- .../grpcpp/security/tls_credentials_options.h | 22 ++++++++++++------- src/cpp/common/tls_credentials_options.cc | 2 +- 2 files changed, 15 insertions(+), 9 deletions(-) diff --git a/include/grpcpp/security/tls_credentials_options.h b/include/grpcpp/security/tls_credentials_options.h index 8dfff315a7b..dec1840010b 100644 --- a/include/grpcpp/security/tls_credentials_options.h +++ b/include/grpcpp/security/tls_credentials_options.h @@ -27,9 +27,12 @@ #include typedef struct grpc_tls_credential_reload_arg grpc_tls_credential_reload_arg; -typedef struct grpc_tls_credential_reload_config grpc_tls_credential_reload_config; -typedef struct grpc_tls_server_authorization_check_arg grpc_tls_server_authorization_check_arg; -typedef struct grpc_tls_server_authorization_check_config grpc_tls_server_authorization_check_config; +typedef struct grpc_tls_credential_reload_config + grpc_tls_credential_reload_config; +typedef struct grpc_tls_server_authorization_check_arg + grpc_tls_server_authorization_check_arg; +typedef struct grpc_tls_server_authorization_check_config + grpc_tls_server_authorization_check_config; typedef struct grpc_tls_credentials_options grpc_tls_credentials_options; namespace grpc_impl { @@ -63,7 +66,7 @@ class TlsKeyMaterialsConfig { grpc::string pem_root_certs_; }; -//typedef struct grpc_tls_credential_reload_arg grpc_tls_credential_reload_arg; +// typedef struct grpc_tls_credential_reload_arg grpc_tls_credential_reload_arg; /** TLS credential reload arguments, wraps grpc_tls_credential_reload_arg. It is * used for experimental purposes for now and it is subject to change. @@ -109,7 +112,8 @@ class TlsCredentialReloadArg { grpc_tls_credential_reload_arg* c_arg_; }; -//typedef struct grpc_tls_credential_reload_config grpc_tls_credential_reload_config; +// typedef struct grpc_tls_credential_reload_config +// grpc_tls_credential_reload_config; /** TLS credential reloag config, wraps grpc_tls_credential_reload_config. It is * used for experimental purposes for now and it is subject to change. @@ -157,7 +161,8 @@ class TlsCredentialReloadConfig { void (*destruct_)(void* config_user_data); }; -//typedef struct grpc_tls_server_authorization_check_arg grpc_tls_server_authorization_check_arg; +// typedef struct grpc_tls_server_authorization_check_arg +// grpc_tls_server_authorization_check_arg; /** TLS server authorization check arguments, wraps * grpc_tls_server_authorization_check_arg. It is used for experimental @@ -206,7 +211,8 @@ class TlsServerAuthorizationCheckArg { grpc_tls_server_authorization_check_arg* c_arg_; }; -//typedef struct ::grpc_tls_server_authorization_check_config grpc_tls_server_authorization_check_config; +// typedef struct ::grpc_tls_server_authorization_check_config +// grpc_tls_server_authorization_check_config; /** TLS server authorization check config, wraps * grps_tls_server_authorization_check_config. It is used for experimental @@ -260,7 +266,7 @@ class TlsServerAuthorizationCheckConfig { void (*destruct_)(void* config_user_data); }; -//typedef struct ::grpc_tls_credentials_options grpc_tls_credentials_options; +// typedef struct ::grpc_tls_credentials_options grpc_tls_credentials_options; /** TLS credentials options, wrapper for grpc_tls_credentials_options. It is * used for experimental purposes for now and it is subject to change. See the diff --git a/src/cpp/common/tls_credentials_options.cc b/src/cpp/common/tls_credentials_options.cc index 74f36f6b984..51f1d48944c 100644 --- a/src/cpp/common/tls_credentials_options.cc +++ b/src/cpp/common/tls_credentials_options.cc @@ -16,8 +16,8 @@ * */ -#include "src/core/lib/security/credentials/tls/grpc_tls_credentials_options.h" #include +#include "src/core/lib/security/credentials/tls/grpc_tls_credentials_options.h" #include "src/cpp/common/tls_credentials_options_util.h"