Re-enabling errors on warning, disabling unused parameter warning, and fixing all subsequent errors.

3 files changed, 4 insertions, 4 deletions

diff --git a/test/core/json/json_rewrite.c b/test/core/json/json_rewrite.c
index edece98d57..a761a670f0 100644
--- a/test/core/json/json_rewrite.c
+++ b/test/core/json/json_rewrite.c
@@ -131,7 +131,7 @@ static void json_reader_string_add_utf32(void* userdata, gpr_uint32 c) {
 }
 
 static gpr_uint32 json_reader_read_char(void* userdata) {
-  gpr_uint32 r;
+  int r;
   json_reader_userdata* state = userdata;
 
   r = fgetc(state->in);
diff --git a/test/core/json/json_rewrite_test.c b/test/core/json/json_rewrite_test.c
index e47a418761..4ce406c990 100644
--- a/test/core/json/json_rewrite_test.c
+++ b/test/core/json/json_rewrite_test.c
@@ -138,7 +138,7 @@ static void json_reader_string_add_utf32(void* userdata, gpr_uint32 c) {
 }
 
 static gpr_uint32 json_reader_read_char(void* userdata) {
-  gpr_uint32 r;
+  int r;
   json_reader_userdata* state = userdata;
 
   if (!state->did_eagain) {
@@ -298,7 +298,7 @@ static test_file test_files[] = {
 };
 
 void test_rewrites() {
-  int i;
+  unsigned i;
 
   for (i = 0; i < GPR_ARRAY_SIZE(test_files); i++) {
     test_file* test = test_files + i;
diff --git a/test/core/json/json_test.c b/test/core/json/json_test.c
index c234eb9ede..11659a5716 100644
--- a/test/core/json/json_test.c
+++ b/test/core/json/json_test.c
@@ -124,7 +124,7 @@ static testing_pair testing_pairs[] = {
 };
 
 static void test_pairs() {
-  int i;
+  unsigned i;
 
   for (i = 0; i < GPR_ARRAY_SIZE(testing_pairs); i++) {
     testing_pair* pair = testing_pairs + i;