diff options
author | 2015-07-09 13:09:16 -0700 | |
---|---|---|
committer | 2015-07-09 13:09:16 -0700 | |
commit | 7d4f8a1d2b63ce70471ee44aa17647bd82a2e05f (patch) | |
tree | 1b04a52105ee6fa3a921034e4f8909720505eb92 /src/core/surface/server.c | |
parent | ea0c361e2376aa215b6f9f5b24215f0476b5f980 (diff) | |
parent | 494886a1be23865af7eb223b1a190fb9d2e2cc30 (diff) |
Merge github.com:grpc/grpc into simpler-cq
Diffstat (limited to 'src/core/surface/server.c')
-rw-r--r-- | src/core/surface/server.c | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/src/core/surface/server.c b/src/core/surface/server.c index 1a99acd536..d2d9a7b038 100644 --- a/src/core/surface/server.c +++ b/src/core/surface/server.c @@ -499,10 +499,10 @@ static grpc_mdelem *server_filter(void *user_data, grpc_mdelem *md) { channel_data *chand = elem->channel_data; call_data *calld = elem->call_data; if (md->key == chand->path_key) { - calld->path = grpc_mdstr_ref(md->value); + calld->path = GRPC_MDSTR_REF(md->value); return NULL; } else if (md->key == chand->authority_key) { - calld->host = grpc_mdstr_ref(md->value); + calld->host = GRPC_MDSTR_REF(md->value); return NULL; } return md; @@ -645,10 +645,10 @@ static void destroy_call_elem(grpc_call_element *elem) { } if (calld->host) { - grpc_mdstr_unref(calld->host); + GRPC_MDSTR_UNREF(calld->host); } if (calld->path) { - grpc_mdstr_unref(calld->path); + GRPC_MDSTR_UNREF(calld->path); } gpr_mu_destroy(&calld->mu_state); @@ -680,10 +680,10 @@ static void destroy_channel_elem(grpc_channel_element *elem) { if (chand->registered_methods) { for (i = 0; i < chand->registered_method_slots; i++) { if (chand->registered_methods[i].method) { - grpc_mdstr_unref(chand->registered_methods[i].method); + GRPC_MDSTR_UNREF(chand->registered_methods[i].method); } if (chand->registered_methods[i].host) { - grpc_mdstr_unref(chand->registered_methods[i].host); + GRPC_MDSTR_UNREF(chand->registered_methods[i].host); } } gpr_free(chand->registered_methods); @@ -695,8 +695,8 @@ static void destroy_channel_elem(grpc_channel_element *elem) { chand->next = chand->prev = chand; maybe_finish_shutdown(chand->server); gpr_mu_unlock(&chand->server->mu_global); - grpc_mdstr_unref(chand->path_key); - grpc_mdstr_unref(chand->authority_key); + GRPC_MDSTR_UNREF(chand->path_key); + GRPC_MDSTR_UNREF(chand->authority_key); server_unref(chand->server); } } |