summaryrefslogtreecommitdiff
path: root/strings/json_lib.c
diff options
context:
space:
mode:
authorVladislav Vaintroub <wlad@mariadb.com>2017-09-28 10:38:02 +0000
committerVladislav Vaintroub <wlad@mariadb.com>2017-09-28 17:20:46 +0000
commit7354dc67737fdeb105656f5cec055da627bb9c29 (patch)
tree7cc2b5f975d5e32eb94cd1344b259ea1b24018d6 /strings/json_lib.c
parent509928718d52a14739fcfb2ebf0e68b4c8e01be5 (diff)
downloadmariadb-git-7354dc67737fdeb105656f5cec055da627bb9c29.tar.gz
MDEV-13384 - misc Windows warnings fixed
Diffstat (limited to 'strings/json_lib.c')
-rw-r--r--strings/json_lib.c10
1 files changed, 5 insertions, 5 deletions
diff --git a/strings/json_lib.c b/strings/json_lib.c
index f666d95985b..3df2ecd4768 100644
--- a/strings/json_lib.c
+++ b/strings/json_lib.c
@@ -401,7 +401,7 @@ static int read_strn(json_engine_t *j)
return 1;
j->state= j->stack[j->stack_p];
- j->value_len= (j->s.c_str - j->value) - 1;
+ j->value_len= (int)(j->s.c_str - j->value) - 1;
return 0;
}
@@ -539,7 +539,7 @@ static int read_num(json_engine_t *j)
if (skip_num_constant(j) == 0)
{
j->value_type= JSON_VALUE_NUMBER;
- j->value_len= j->s.c_str - j->value_begin;
+ j->value_len= (int)(j->s.c_str - j->value_begin);
return 0;
}
return 1;
@@ -1496,7 +1496,7 @@ int json_append_ascii(CHARSET_INFO *json_cs,
return c_len;
}
- return json - json_start;
+ return (int)(json - json_start);
}
@@ -1532,7 +1532,7 @@ int json_unescape(CHARSET_INFO *json_cs,
return -1;
}
- return s.error==JE_EOS ? res - res_b : -1;
+ return s.error==JE_EOS ? (int)(res - res_b) : -1;
}
@@ -1647,7 +1647,7 @@ int json_escape(CHARSET_INFO *str_cs,
}
}
- return json - json_start;
+ return (int)(json - json_start);
}