Merge github.com:/google/grpc

10 years ago · 1574513611
parent 9fef05c2f0 d8532af01c
commit 1574513611
6 changed files with 7 additions and 7 deletions
--- a/build.json
+++ b/build.json
@ -282,8 +282,7 @@
        "src/core/tsi/fake_transport_security.h",
        "src/core/tsi/ssl_transport_security.h",
        "src/core/tsi/transport_security.h",
-        "src/core/tsi/transport_security_interface.h",
-        "src/core/tsi/transport_security_test_lib.h"
+        "src/core/tsi/transport_security_interface.h"
      ],
      "deps": [
        "gpr"
--- a/src/core/support/log_linux.c
+++ b/src/core/support/log_linux.c
@ -54,7 +54,10 @@ void gpr_log(const char *file, int line, gpr_log_severity severity,
  char *message = NULL;
  va_list args;
  va_start(args, format);
-  vasprintf(&message, format, args);
+  if (vasprintf(&message, format, args) == -1) {
+    va_end(args);
+    return;
+  }
  va_end(args);
  gpr_log_message(file, line, severity, message);
  free(message);
--- a/src/cpp/client/credentials.cc
+++ b/src/cpp/client/credentials.cc
@ -34,7 +34,7 @@

 #include <string>

-#include <grpc/grpc_security_google.h>
+#include <grpc/grpc_security.h>
 #include <grpc/support/log.h>

 #include <grpc++/credentials.h>
--- a/src/cpp/server/server_credentials.cc
+++ b/src/cpp/server/server_credentials.cc
@ -32,7 +32,7 @@
 */


-#include <grpc/grpc_security_google.h>
+#include <grpc/grpc_security.h>

 #include <grpc++/server_credentials.h>

--- a/vsprojects/vs2013/grpc.vcxproj
+++ b/vsprojects/vs2013/grpc.vcxproj
@ -91,7 +91,6 @@
    <ClInclude Include="..\..\src\core\tsi\ssl_transport_security.h" />
    <ClInclude Include="..\..\src\core\tsi\transport_security.h" />
    <ClInclude Include="..\..\src\core\tsi\transport_security_interface.h" />
-    <ClInclude Include="..\..\src\core\tsi\transport_security_test_lib.h" />
    <ClInclude Include="..\..\src\core\channel\census_filter.h" />
    <ClInclude Include="..\..\src\core\channel\channel_args.h" />
    <ClInclude Include="..\..\src\core\channel\channel_stack.h" />
--- a/vsprojects/vs2013/grpc_unsecure.vcxproj
+++ b/vsprojects/vs2013/grpc_unsecure.vcxproj
@ -91,7 +91,6 @@
    <ClInclude Include="..\..\src\core\tsi\ssl_transport_security.h" />
    <ClInclude Include="..\..\src\core\tsi\transport_security.h" />
    <ClInclude Include="..\..\src\core\tsi\transport_security_interface.h" />
-    <ClInclude Include="..\..\src\core\tsi\transport_security_test_lib.h" />
    <ClInclude Include="..\..\src\core\channel\census_filter.h" />
    <ClInclude Include="..\..\src\core\channel\channel_args.h" />
    <ClInclude Include="..\..\src\core\channel\channel_stack.h" />