diff options
Diffstat (limited to 'src/core/lib/security/credentials/credentials.cc')
-rw-r--r-- | src/core/lib/security/credentials/credentials.cc | 65 |
1 files changed, 34 insertions, 31 deletions
diff --git a/src/core/lib/security/credentials/credentials.cc b/src/core/lib/security/credentials/credentials.cc index e60d022f1b..90576e69b9 100644 --- a/src/core/lib/security/credentials/credentials.cc +++ b/src/core/lib/security/credentials/credentials.cc @@ -55,16 +55,16 @@ void grpc_credentials_metadata_request_destroy( grpc_channel_credentials* grpc_channel_credentials_ref( grpc_channel_credentials* creds) { - if (creds == NULL) return NULL; + if (creds == nullptr) return nullptr; gpr_ref(&creds->refcount); return creds; } void grpc_channel_credentials_unref(grpc_exec_ctx* exec_ctx, grpc_channel_credentials* creds) { - if (creds == NULL) return; + if (creds == nullptr) return; if (gpr_unref(&creds->refcount)) { - if (creds->vtable->destruct != NULL) { + if (creds->vtable->destruct != nullptr) { creds->vtable->destruct(exec_ctx, creds); } gpr_free(creds); @@ -79,16 +79,16 @@ void grpc_channel_credentials_release(grpc_channel_credentials* creds) { } grpc_call_credentials* grpc_call_credentials_ref(grpc_call_credentials* creds) { - if (creds == NULL) return NULL; + if (creds == nullptr) return nullptr; gpr_ref(&creds->refcount); return creds; } void grpc_call_credentials_unref(grpc_exec_ctx* exec_ctx, grpc_call_credentials* creds) { - if (creds == NULL) return; + if (creds == nullptr) return; if (gpr_unref(&creds->refcount)) { - if (creds->vtable->destruct != NULL) { + if (creds->vtable->destruct != nullptr) { creds->vtable->destruct(exec_ctx, creds); } gpr_free(creds); @@ -107,7 +107,7 @@ bool grpc_call_credentials_get_request_metadata( grpc_polling_entity* pollent, grpc_auth_metadata_context context, grpc_credentials_mdelem_array* md_array, grpc_closure* on_request_metadata, grpc_error** error) { - if (creds == NULL || creds->vtable->get_request_metadata == NULL) { + if (creds == nullptr || creds->vtable->get_request_metadata == nullptr) { return true; } return creds->vtable->get_request_metadata( @@ -117,7 +117,8 @@ bool grpc_call_credentials_get_request_metadata( void grpc_call_credentials_cancel_get_request_metadata( grpc_exec_ctx* exec_ctx, grpc_call_credentials* creds, grpc_credentials_mdelem_array* md_array, grpc_error* error) { - if (creds == NULL || creds->vtable->cancel_get_request_metadata == NULL) { + if (creds == nullptr || + creds->vtable->cancel_get_request_metadata == nullptr) { return; } creds->vtable->cancel_get_request_metadata(exec_ctx, creds, md_array, error); @@ -127,20 +128,20 @@ grpc_security_status grpc_channel_credentials_create_security_connector( grpc_exec_ctx* exec_ctx, grpc_channel_credentials* channel_creds, const char* target, const grpc_channel_args* args, grpc_channel_security_connector** sc, grpc_channel_args** new_args) { - *new_args = NULL; - if (channel_creds == NULL) { + *new_args = nullptr; + if (channel_creds == nullptr) { return GRPC_SECURITY_ERROR; } - GPR_ASSERT(channel_creds->vtable->create_security_connector != NULL); + GPR_ASSERT(channel_creds->vtable->create_security_connector != nullptr); return channel_creds->vtable->create_security_connector( - exec_ctx, channel_creds, NULL, target, args, sc, new_args); + exec_ctx, channel_creds, nullptr, target, args, sc, new_args); } grpc_channel_credentials* grpc_channel_credentials_duplicate_without_call_credentials( grpc_channel_credentials* channel_creds) { - if (channel_creds != NULL && channel_creds->vtable != NULL && - channel_creds->vtable->duplicate_without_call_credentials != NULL) { + if (channel_creds != nullptr && channel_creds->vtable != nullptr && + channel_creds->vtable->duplicate_without_call_credentials != nullptr) { return channel_creds->vtable->duplicate_without_call_credentials( channel_creds); } else { @@ -171,11 +172,11 @@ grpc_arg grpc_channel_credentials_to_arg( grpc_channel_credentials* grpc_channel_credentials_from_arg( const grpc_arg* arg) { - if (strcmp(arg->key, GRPC_ARG_CHANNEL_CREDENTIALS)) return NULL; + if (strcmp(arg->key, GRPC_ARG_CHANNEL_CREDENTIALS)) return nullptr; if (arg->type != GRPC_ARG_POINTER) { gpr_log(GPR_ERROR, "Invalid type %d for arg %s", arg->type, GRPC_ARG_CHANNEL_CREDENTIALS); - return NULL; + return nullptr; } return (grpc_channel_credentials*)arg->value.pointer.p; } @@ -183,30 +184,31 @@ grpc_channel_credentials* grpc_channel_credentials_from_arg( grpc_channel_credentials* grpc_channel_credentials_find_in_args( const grpc_channel_args* args) { size_t i; - if (args == NULL) return NULL; + if (args == nullptr) return nullptr; for (i = 0; i < args->num_args; i++) { grpc_channel_credentials* credentials = grpc_channel_credentials_from_arg(&args->args[i]); - if (credentials != NULL) return credentials; + if (credentials != nullptr) return credentials; } - return NULL; + return nullptr; } grpc_server_credentials* grpc_server_credentials_ref( grpc_server_credentials* creds) { - if (creds == NULL) return NULL; + if (creds == nullptr) return nullptr; gpr_ref(&creds->refcount); return creds; } void grpc_server_credentials_unref(grpc_exec_ctx* exec_ctx, grpc_server_credentials* creds) { - if (creds == NULL) return; + if (creds == nullptr) return; if (gpr_unref(&creds->refcount)) { - if (creds->vtable->destruct != NULL) { + if (creds->vtable->destruct != nullptr) { creds->vtable->destruct(exec_ctx, creds); } - if (creds->processor.destroy != NULL && creds->processor.state != NULL) { + if (creds->processor.destroy != nullptr && + creds->processor.state != nullptr) { creds->processor.destroy(creds->processor.state); } gpr_free(creds); @@ -223,7 +225,7 @@ void grpc_server_credentials_release(grpc_server_credentials* creds) { grpc_security_status grpc_server_credentials_create_security_connector( grpc_exec_ctx* exec_ctx, grpc_server_credentials* creds, grpc_server_security_connector** sc) { - if (creds == NULL || creds->vtable->create_security_connector == NULL) { + if (creds == nullptr || creds->vtable->create_security_connector == nullptr) { gpr_log(GPR_ERROR, "Server credentials cannot create security context."); return GRPC_SECURITY_ERROR; } @@ -237,8 +239,9 @@ void grpc_server_credentials_set_auth_metadata_processor( "creds=%p, " "processor=grpc_auth_metadata_processor { process: %p, state: %p })", 3, (creds, (void*)(intptr_t)processor.process, processor.state)); - if (creds == NULL) return; - if (creds->processor.destroy != NULL && creds->processor.state != NULL) { + if (creds == nullptr) return; + if (creds->processor.destroy != nullptr && + creds->processor.state != nullptr) { creds->processor.destroy(creds->processor.state); } creds->processor = processor; @@ -267,11 +270,11 @@ grpc_arg grpc_server_credentials_to_arg(grpc_server_credentials* p) { } grpc_server_credentials* grpc_server_credentials_from_arg(const grpc_arg* arg) { - if (strcmp(arg->key, GRPC_SERVER_CREDENTIALS_ARG) != 0) return NULL; + if (strcmp(arg->key, GRPC_SERVER_CREDENTIALS_ARG) != 0) return nullptr; if (arg->type != GRPC_ARG_POINTER) { gpr_log(GPR_ERROR, "Invalid type %d for arg %s", arg->type, GRPC_SERVER_CREDENTIALS_ARG); - return NULL; + return nullptr; } return (grpc_server_credentials*)arg->value.pointer.p; } @@ -279,11 +282,11 @@ grpc_server_credentials* grpc_server_credentials_from_arg(const grpc_arg* arg) { grpc_server_credentials* grpc_find_server_credentials_in_args( const grpc_channel_args* args) { size_t i; - if (args == NULL) return NULL; + if (args == nullptr) return nullptr; for (i = 0; i < args->num_args; i++) { grpc_server_credentials* p = grpc_server_credentials_from_arg(&args->args[i]); - if (p != NULL) return p; + if (p != nullptr) return p; } - return NULL; + return nullptr; } |