diff options
| author |  Craig Tiller <craig.tiller@gmail.com> | 2015-07-08 15:31:57 -0700 |
|---|---|---|
| committer | Craig Tiller <craig.tiller@gmail.com> | 2015-07-08 15:31:57 -0700 |
| commit | ba334e951b830c5f31934ecbf202125481180767 (patch) | |
| tree | 986b5b09b4c411057073b5f7d5c68775c0cdc10d /src/core | |
| parent | 97fc6a3f3f6e3bbb39b6fda1444bc533deb8803d (diff) | |
| parent | aa9b3ac5c70d43207de79be6b4151b2e01ffb6f8 (diff) | |
Merge github.com:grpc/grpc into simpler-cq
Diffstat (limited to 'src/core')
| -rw-r--r-- | src/core/channel/client_channel.c | 2 | ||||
| -rw-r--r-- | src/core/json/json.h | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/src/core/channel/client_channel.c b/src/core/channel/client_channel.c index 871e970eb8..f890f99237 100644 --- a/src/core/channel/client_channel.c +++ b/src/core/channel/client_channel.c @@ -427,7 +427,7 @@ static void cc_on_config_changed(void *arg, int iomgr_success) { GRPC_RESOLVER_REF(resolver, "channel-next"); gpr_mu_unlock(&chand->mu_config); GRPC_CHANNEL_INTERNAL_REF(chand->master, "resolver"); - grpc_resolver_next(chand->resolver, &chand->incoming_configuration, + grpc_resolver_next(resolver, &chand->incoming_configuration, &chand->on_config_changed); GRPC_RESOLVER_UNREF(resolver, "channel-next"); } else { diff --git a/src/core/json/json.h b/src/core/json/json.h index b78b42a5b2..cac18ad885 100644 --- a/src/core/json/json.h +++ b/src/core/json/json.h @@ -53,7 +53,7 @@ typedef struct grpc_json { } grpc_json; /* The next two functions are going to parse the input string, and - * destroy it in the process, in order to use its space to store + * modify it in the process, in order to use its space to store * all of the keys and values for the returned object tree. * * They assume UTF-8 input stream, and will output UTF-8 encoded |