diff options
author | Craig Tiller <ctiller@google.com> | 2017-11-13 15:41:31 -0800 |
---|---|---|
committer | GitHub <noreply@github.com> | 2017-11-13 15:41:31 -0800 |
commit | b0bad8f3864dc9c8745736fe68efe513b2b84932 (patch) | |
tree | a94f7bf6f6e1d5dc257bec928359bad16623eada /src/core/lib/transport/service_config.cc | |
parent | e52772451a7bbf4f3f7b72cfc369781fd74a6930 (diff) | |
parent | a61abff6adfd035560d20bc255c01c6c83d22091 (diff) |
Merge pull request #13349 from ctiller/lfe3
Convert all uses of NULL to nullptr
Diffstat (limited to 'src/core/lib/transport/service_config.cc')
-rw-r--r-- | src/core/lib/transport/service_config.cc | 92 |
1 files changed, 46 insertions, 46 deletions
diff --git a/src/core/lib/transport/service_config.cc b/src/core/lib/transport/service_config.cc index 05907de7d7..adcec8c444 100644 --- a/src/core/lib/transport/service_config.cc +++ b/src/core/lib/transport/service_config.cc @@ -64,11 +64,11 @@ grpc_service_config* grpc_service_config_create(const char* json_string) { service_config->json_string = gpr_strdup(json_string); service_config->json_tree = grpc_json_parse_string(service_config->json_string); - if (service_config->json_tree == NULL) { + if (service_config->json_tree == nullptr) { gpr_log(GPR_INFO, "failed to parse JSON for service config"); gpr_free(service_config->json_string); gpr_free(service_config); - return NULL; + return nullptr; } return service_config; } @@ -83,9 +83,9 @@ void grpc_service_config_parse_global_params( const grpc_service_config* service_config, void (*process_json)(const grpc_json* json, void* arg), void* arg) { const grpc_json* json = service_config->json_tree; - if (json->type != GRPC_JSON_OBJECT || json->key != NULL) return; - for (grpc_json* field = json->child; field != NULL; field = field->next) { - if (field->key == NULL) return; + if (json->type != GRPC_JSON_OBJECT || json->key != nullptr) return; + for (grpc_json* field = json->child; field != nullptr; field = field->next) { + if (field->key == nullptr) return; if (strcmp(field->key, "methodConfig") == 0) continue; process_json(field, arg); } @@ -94,13 +94,13 @@ void grpc_service_config_parse_global_params( const char* grpc_service_config_get_lb_policy_name( const grpc_service_config* service_config) { const grpc_json* json = service_config->json_tree; - if (json->type != GRPC_JSON_OBJECT || json->key != NULL) return NULL; - const char* lb_policy_name = NULL; - for (grpc_json* field = json->child; field != NULL; field = field->next) { - if (field->key == NULL) return NULL; + if (json->type != GRPC_JSON_OBJECT || json->key != nullptr) return nullptr; + const char* lb_policy_name = nullptr; + for (grpc_json* field = json->child; field != nullptr; field = field->next) { + if (field->key == nullptr) return nullptr; if (strcmp(field->key, "loadBalancingPolicy") == 0) { - if (lb_policy_name != NULL) return NULL; // Duplicate. - if (field->type != GRPC_JSON_STRING) return NULL; + if (lb_policy_name != nullptr) return nullptr; // Duplicate. + if (field->type != GRPC_JSON_STRING) return nullptr; lb_policy_name = field->value; } } @@ -110,10 +110,10 @@ const char* grpc_service_config_get_lb_policy_name( // Returns the number of names specified in the method config \a json. static size_t count_names_in_method_config_json(grpc_json* json) { size_t num_names = 0; - for (grpc_json* field = json->child; field != NULL; field = field->next) { - if (field->key != NULL && strcmp(field->key, "name") == 0) { + for (grpc_json* field = json->child; field != nullptr; field = field->next) { + if (field->key != nullptr && strcmp(field->key, "name") == 0) { if (field->type != GRPC_JSON_ARRAY) return -1; - for (grpc_json* name = field->child; name != NULL; name = name->next) { + for (grpc_json* name = field->child; name != nullptr; name = name->next) { if (name->type != GRPC_JSON_OBJECT) return -1; ++num_names; } @@ -125,26 +125,26 @@ static size_t count_names_in_method_config_json(grpc_json* json) { // Returns a path string for the JSON name object specified by \a json. // Returns NULL on error. Caller takes ownership of result. static char* parse_json_method_name(grpc_json* json) { - if (json->type != GRPC_JSON_OBJECT) return NULL; - const char* service_name = NULL; - const char* method_name = NULL; - for (grpc_json* child = json->child; child != NULL; child = child->next) { - if (child->key == NULL) return NULL; - if (child->type != GRPC_JSON_STRING) return NULL; + if (json->type != GRPC_JSON_OBJECT) return nullptr; + const char* service_name = nullptr; + const char* method_name = nullptr; + for (grpc_json* child = json->child; child != nullptr; child = child->next) { + if (child->key == nullptr) return nullptr; + if (child->type != GRPC_JSON_STRING) return nullptr; if (strcmp(child->key, "service") == 0) { - if (service_name != NULL) return NULL; // Duplicate. - if (child->value == NULL) return NULL; + if (service_name != nullptr) return nullptr; // Duplicate. + if (child->value == nullptr) return nullptr; service_name = child->value; } else if (strcmp(child->key, "method") == 0) { - if (method_name != NULL) return NULL; // Duplicate. - if (child->value == NULL) return NULL; + if (method_name != nullptr) return nullptr; // Duplicate. + if (child->value == nullptr) return nullptr; method_name = child->value; } } - if (service_name == NULL) return NULL; // Required field. + if (service_name == nullptr) return nullptr; // Required field. char* path; gpr_asprintf(&path, "/%s/%s", service_name, - method_name == NULL ? "*" : method_name); + method_name == nullptr ? "*" : method_name); return path; } @@ -159,18 +159,18 @@ static bool parse_json_method_config( grpc_slice_hash_table_entry* entries, size_t* idx) { // Construct value. void* method_config = create_value(json); - if (method_config == NULL) return false; + if (method_config == nullptr) return false; // Construct list of paths. bool success = false; gpr_strvec paths; gpr_strvec_init(&paths); - for (grpc_json* child = json->child; child != NULL; child = child->next) { - if (child->key == NULL) continue; + for (grpc_json* child = json->child; child != nullptr; child = child->next) { + if (child->key == nullptr) continue; if (strcmp(child->key, "name") == 0) { if (child->type != GRPC_JSON_ARRAY) goto done; - for (grpc_json* name = child->child; name != NULL; name = name->next) { + for (grpc_json* name = child->child; name != nullptr; name = name->next) { char* path = parse_json_method_name(name); - if (path == NULL) goto done; + if (path == nullptr) goto done; gpr_strvec_add(&paths, path); } } @@ -196,26 +196,26 @@ grpc_slice_hash_table* grpc_service_config_create_method_config_table( void (*unref_value)(grpc_exec_ctx* exec_ctx, void* value)) { const grpc_json* json = service_config->json_tree; // Traverse parsed JSON tree. - if (json->type != GRPC_JSON_OBJECT || json->key != NULL) return NULL; + if (json->type != GRPC_JSON_OBJECT || json->key != nullptr) return nullptr; size_t num_entries = 0; - grpc_slice_hash_table_entry* entries = NULL; - for (grpc_json* field = json->child; field != NULL; field = field->next) { - if (field->key == NULL) return NULL; + grpc_slice_hash_table_entry* entries = nullptr; + for (grpc_json* field = json->child; field != nullptr; field = field->next) { + if (field->key == nullptr) return nullptr; if (strcmp(field->key, "methodConfig") == 0) { - if (entries != NULL) return NULL; // Duplicate. - if (field->type != GRPC_JSON_ARRAY) return NULL; + if (entries != nullptr) return nullptr; // Duplicate. + if (field->type != GRPC_JSON_ARRAY) return nullptr; // Find number of entries. - for (grpc_json* method = field->child; method != NULL; + for (grpc_json* method = field->child; method != nullptr; method = method->next) { size_t count = count_names_in_method_config_json(method); - if (count <= 0) return NULL; + if (count <= 0) return nullptr; num_entries += count; } // Populate method config table entries. entries = (grpc_slice_hash_table_entry*)gpr_malloc( num_entries * sizeof(grpc_slice_hash_table_entry)); size_t idx = 0; - for (grpc_json* method = field->child; method != NULL; + for (grpc_json* method = field->child; method != nullptr; method = method->next) { if (!parse_json_method_config(exec_ctx, method, create_value, ref_value, unref_value, entries, &idx)) { @@ -224,17 +224,17 @@ grpc_slice_hash_table* grpc_service_config_create_method_config_table( unref_value(exec_ctx, entries[i].value); } gpr_free(entries); - return NULL; + return nullptr; } } GPR_ASSERT(idx == num_entries); } } // Instantiate method config table. - grpc_slice_hash_table* method_config_table = NULL; - if (entries != NULL) { - method_config_table = - grpc_slice_hash_table_create(num_entries, entries, unref_value, NULL); + grpc_slice_hash_table* method_config_table = nullptr; + if (entries != nullptr) { + method_config_table = grpc_slice_hash_table_create(num_entries, entries, + unref_value, nullptr); gpr_free(entries); } return method_config_table; @@ -246,7 +246,7 @@ void* grpc_method_config_table_get(grpc_exec_ctx* exec_ctx, void* value = grpc_slice_hash_table_get(table, path); // If we didn't find a match for the path, try looking for a wildcard // entry (i.e., change "/service/method" to "/service/*"). - if (value == NULL) { + if (value == nullptr) { char* path_str = grpc_slice_to_c_string(path); const char* sep = strrchr(path_str, '/') + 1; const size_t len = (size_t)(sep - path_str); |