size_t shouldn't have the value -1; switch to int

pull/16387/head
Vijay Pai 6 years ago
parent 5d302d1a9f
commit 9e515951ac
  1. 4
      src/core/lib/transport/service_config.cc
  2. 6
      src/core/lib/transport/service_config.h

@ -65,8 +65,8 @@ const char* ServiceConfig::GetLoadBalancingPolicyName() const {
return lb_policy_name; return lb_policy_name;
} }
size_t ServiceConfig::CountNamesInMethodConfig(grpc_json* json) { int ServiceConfig::CountNamesInMethodConfig(grpc_json* json) {
size_t num_names = 0; int num_names = 0;
for (grpc_json* field = json->child; field != nullptr; field = field->next) { for (grpc_json* field = json->child; field != nullptr; field = field->next) {
if (field->key != nullptr && strcmp(field->key, "name") == 0) { if (field->key != nullptr && strcmp(field->key, "name") == 0) {
if (field->type != GRPC_JSON_ARRAY) return -1; if (field->type != GRPC_JSON_ARRAY) return -1;

@ -103,7 +103,7 @@ class ServiceConfig {
ServiceConfig(UniquePtr<char> json_string, grpc_json* json_tree); ServiceConfig(UniquePtr<char> json_string, grpc_json* json_tree);
// Returns the number of names specified in the method config \a json. // Returns the number of names specified in the method config \a json.
static size_t CountNamesInMethodConfig(grpc_json* json); static int CountNamesInMethodConfig(grpc_json* json);
// Returns a path string for the JSON name object specified by \a json. // Returns a path string for the JSON name object specified by \a json.
// Returns null on error. // Returns null on error.
@ -188,9 +188,9 @@ ServiceConfig::CreateMethodConfigTable(CreateValue<T> create_value) {
// Find number of entries. // Find number of entries.
for (grpc_json* method = field->child; method != nullptr; for (grpc_json* method = field->child; method != nullptr;
method = method->next) { method = method->next) {
size_t count = CountNamesInMethodConfig(method); int count = CountNamesInMethodConfig(method);
if (count <= 0) return nullptr; if (count <= 0) return nullptr;
num_entries += count; num_entries += static_cast<size_t>(count);
} }
// Populate method config table entries. // Populate method config table entries.
entries = static_cast<typename SliceHashTable<RefCountedPtr<T>>::Entry*>( entries = static_cast<typename SliceHashTable<RefCountedPtr<T>>::Entry*>(

Loading…
Cancel
Save