diff options
| author |  Nicolas "Pixel" Noble <pixel@nobis-crew.org> | 2015-06-02 02:01:51 +0200 |
|---|---|---|
| committer | Nicolas "Pixel" Noble <pixel@nobis-crew.org> | 2015-06-02 02:01:51 +0200 |
| commit | 8535263b94ee56bbd0e4c9ee168719217459b858 (patch) | |
| tree | 16e0928c50fe68e9a6507d2988f15d0ce521ba9b | |
| parent | 5d8f91906ba534ad23db5c0d45c52150c2d50816 (diff) | |
Fixing tools compilation.
| -rw-r--r-- | src/core/transport/chttp2/gen_hpack_tables.c | 6 | ||||
| -rw-r--r-- | test/core/security/fetch_oauth2.c | 5 | ||||
| -rw-r--r-- | test/core/security/print_google_default_creds_token.c | 5 |
3 files changed, 9 insertions, 7 deletions
diff --git a/src/core/transport/chttp2/gen_hpack_tables.c b/src/core/transport/chttp2/gen_hpack_tables.c index 86b593129b..bdaa3cf094 100644 --- a/src/core/transport/chttp2/gen_hpack_tables.c +++ b/src/core/transport/chttp2/gen_hpack_tables.c @@ -219,10 +219,10 @@ static int state_index(int bitofs, symset syms, int *isnew) { emit - the symbol to emit on this nibble (or -1 if no symbol has been found) syms - the set of symbols that could be matched */ -static void build_dec_tbl(int state, int nibble, int nibbits, int bitofs, +static void build_dec_tbl(int state, int nibble, int nibbits, unsigned bitofs, int emit, symset syms) { int i; - int bit; + unsigned bit; /* If we have four bits in the nibble we're looking at, then we can fill in a slot in the lookup tables. */ @@ -338,7 +338,7 @@ static void generate_base64_inverse_table(void) { static const char alphabet[] = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/="; unsigned char inverse[256]; - int i; + unsigned i; memset(inverse, 255, sizeof(inverse)); for (i = 0; i < strlen(alphabet); i++) { diff --git a/test/core/security/fetch_oauth2.c b/test/core/security/fetch_oauth2.c index 7a40fe0dbb..3202df3328 100644 --- a/test/core/security/fetch_oauth2.c +++ b/test/core/security/fetch_oauth2.c @@ -51,7 +51,8 @@ typedef struct { int is_done; } synchronizer; -static void on_oauth2_response(void *user_data, grpc_mdelem **md_elems, +static void on_oauth2_response(void *user_data, + grpc_credentials_md *md_elems, size_t num_md, grpc_credentials_status status) { synchronizer *sync = user_data; char *token; @@ -60,7 +61,7 @@ static void on_oauth2_response(void *user_data, grpc_mdelem **md_elems, gpr_log(GPR_ERROR, "Fetching token failed."); } else { GPR_ASSERT(num_md == 1); - token_slice = md_elems[0]->value->slice; + token_slice = md_elems[0].value; token = gpr_malloc(GPR_SLICE_LENGTH(token_slice) + 1); memcpy(token, GPR_SLICE_START_PTR(token_slice), GPR_SLICE_LENGTH(token_slice)); diff --git a/test/core/security/print_google_default_creds_token.c b/test/core/security/print_google_default_creds_token.c index 76e69ef716..051e8607c4 100644 --- a/test/core/security/print_google_default_creds_token.c +++ b/test/core/security/print_google_default_creds_token.c @@ -49,7 +49,8 @@ typedef struct { int is_done; } synchronizer; -static void on_metadata_response(void *user_data, grpc_mdelem **md_elems, +static void on_metadata_response(void *user_data, + grpc_credentials_md *md_elems, size_t num_md, grpc_credentials_status status) { synchronizer *sync = user_data; @@ -58,7 +59,7 @@ static void on_metadata_response(void *user_data, grpc_mdelem **md_elems, } else { GPR_ASSERT(num_md == 1); printf("\nGot token: %s\n\n", - (const char *)GPR_SLICE_START_PTR(md_elems[0]->value->slice)); + (const char *)GPR_SLICE_START_PTR(md_elems[0].value)); } gpr_mu_lock(&sync->mu); sync->is_done = 1; |