Merge pull request #1862 from nicolasnoble/fixing-tools

Fixing tools compilation.

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++) {

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));

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;