database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-08-08 11:22:35 +03:00
Code Activity

MDEV-13384 - misc Windows warnings fixed

Browse Source
This commit is contained in:
Vladislav Vaintroub
2017-09-28 10:38:02 +00:00
parent 509928718d
commit 7354dc6773
147 changed files with 545 additions and 491 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
strings/json_lib.c
View File

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