From ba4a862b2c5c1a5e16261c427790a18c7d95aa2f Mon Sep 17 00:00:00 2001 From: Craig Tiller Date: Wed, 18 May 2016 08:43:12 -0700 Subject: [PATCH] Fix compile errors --- test/core/security/create_jwt.c | 9 +++------ test/core/security/fetch_oauth2.c | 11 ++++------- 2 files changed, 7 insertions(+), 13 deletions(-) diff --git a/test/core/security/create_jwt.c b/test/core/security/create_jwt.c index 3c36b767d30..65468bc0ed2 100644 --- a/test/core/security/create_jwt.c +++ b/test/core/security/create_jwt.c @@ -45,13 +45,10 @@ void create_jwt(const char *json_key_file_path, const char *service_url, const char *scope) { grpc_auth_json_key key; - int ok = 0; char *jwt; - gpr_slice json_key_data = gpr_load_file(json_key_file_path, 1, &ok); - if (!ok) { - fprintf(stderr, "Could not read %s.\n", json_key_file_path); - exit(1); - } + gpr_slice json_key_data; + GPR_ASSERT(GRPC_LOG_IF_ERROR( + "load_file", gpr_load_file(json_key_file_path, 1, &json_key_data))); key = grpc_auth_json_key_create_from_string( (const char *)GPR_SLICE_START_PTR(json_key_data)); gpr_slice_unref(json_key_data); diff --git a/test/core/security/fetch_oauth2.c b/test/core/security/fetch_oauth2.c index 2a102fb139b..d970ff9c498 100644 --- a/test/core/security/fetch_oauth2.c +++ b/test/core/security/fetch_oauth2.c @@ -48,13 +48,10 @@ static grpc_call_credentials *create_refresh_token_creds( const char *json_refresh_token_file_path) { - int success; - gpr_slice refresh_token = - gpr_load_file(json_refresh_token_file_path, 1, &success); - if (!success) { - gpr_log(GPR_ERROR, "Could not read file %s.", json_refresh_token_file_path); - exit(1); - } + gpr_slice refresh_token; + GPR_ASSERT(GRPC_LOG_IF_ERROR( + "load_file", + gpr_load_file(json_refresh_token_file_path, 1, &refresh_token))); return grpc_google_refresh_token_credentials_create( (const char *)GPR_SLICE_START_PTR(refresh_token), NULL); }