Skip to content

cleanup: consistently use nullptr in cc contexts #2351

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
goaway merged 2 commits into from
Jun 9, 2022
Merged

cleanup: consistently use nullptr in cc contexts #2351

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
a5a7fcc
cleanup: consistently use nullptr in cc contexts
goaway Jun 9, 2022
da80c62
Merge branch 'main' into ms/use-nullptr
goaway Jun 9, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions library/common/jni/jni_interface.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -456,7 +456,7 @@ static void* jvm_on_metadata(envoy_headers metadata, envoy_stream_intel stream_i
void* context) {
jni_log("[Envoy]", "jvm_on_metadata");
jni_log("[Envoy]", std::to_string(metadata.length).c_str());
return NULL;
return nullptr;
}

static void* jvm_on_trailers(const char* method, envoy_headers trailers,
Expand Down Expand Up @@ -615,7 +615,7 @@ jvm_http_filter_on_resume(const char* method, envoy_headers* headers, envoy_data
headers_length = (jlong)headers->length;
pass_headers("passHeader", *headers, j_context);
}
jbyteArray j_in_data = NULL;
jbyteArray j_in_data = nullptr;
if (data) {
j_in_data = native_data_to_array(env, *data);
}
Expand All @@ -637,7 +637,7 @@ jvm_http_filter_on_resume(const char* method, envoy_headers* headers, envoy_data

env->DeleteLocalRef(jcls_JvmCallbackContext);
env->DeleteLocalRef(j_stream_intel);
if (j_in_data != NULL) {
if (j_in_data != nullptr) {
env->DeleteLocalRef(j_in_data);
}

Expand Down Expand Up @@ -980,7 +980,7 @@ Java_io_envoyproxy_envoymobile_engine_JniLibrary_registerFilterFactory(JNIEnv* e
api->on_error = jvm_http_filter_on_error;
api->release_filter = jni_delete_const_global_ref;
api->static_context = retained_context;
api->instance_context = NULL;
api->instance_context = nullptr;

envoy_status_t result = register_platform_api(env->GetStringUTFChars(filter_name, nullptr), api);
return result;
Expand Down