aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMattias Andrée <maandree@operamail.com>2014-12-08 02:07:50 +0100
committerMattias Andrée <maandree@operamail.com>2014-12-08 02:07:50 +0100
commit728213e1afaba073254398500dacfcdcbc5adf46 (patch)
tree44b75f71d0a23821fe0bcfca4ab9aa88e3c55836
parentm (diff)
downloadmds-728213e1afaba073254398500dacfcdcbc5adf46.tar.gz
mds-728213e1afaba073254398500dacfcdcbc5adf46.tar.bz2
mds-728213e1afaba073254398500dacfcdcbc5adf46.tar.xz
mds-kbdc: bug fix
Signed-off-by: Mattias Andrée <maandree@operamail.com>
-rw-r--r--src/mds-kbdc/compile-layout.c16
1 files changed, 10 insertions, 6 deletions
diff --git a/src/mds-kbdc/compile-layout.c b/src/mds-kbdc/compile-layout.c
index 5099b69..2dae093 100644
--- a/src/mds-kbdc/compile-layout.c
+++ b/src/mds-kbdc/compile-layout.c
@@ -1460,8 +1460,10 @@ static int compile_have(mds_kbdc_tree_assumption_have_t* restrict tree)
return free(data), 0;
/* Make sure we can fit all strings in the assumption list (part 2/2). */
if (result->assumed_strings_ptr == result->assumed_strings_size)
- fail_if (xxrealloc(old, result->assumed_strings, new_size, char*));
- result->assumed_strings_size = new_size;
+ {
+ fail_if (xxrealloc(old, result->assumed_strings, new_size, char32_t*));
+ result->assumed_strings_size = new_size;
+ }
/* Add the assumption to the list. */
result->assumed_strings[result->assumed_strings_ptr++] = data;
}
@@ -1473,8 +1475,10 @@ static int compile_have(mds_kbdc_tree_assumption_have_t* restrict tree)
return free(data), 0;
/* Make sure we can fit all key-combinations in the assumption list (part 2/2). */
if (result->assumed_keys_ptr == result->assumed_keys_size)
- fail_if (xxrealloc(old, result->assumed_keys, new_size, char*));
- result->assumed_keys_size = new_size;
+ {
+ fail_if (xxrealloc(old, result->assumed_keys, new_size, char32_t*));
+ result->assumed_keys_size = new_size;
+ }
/* Add the assumption to the list. */
result->assumed_keys[result->assumed_keys_ptr++] = data;
}
@@ -1516,7 +1520,7 @@ static int compile_have_chars(mds_kbdc_tree_assumption_have_chars_t* restrict tr
if (result->assumed_strings_ptr + n > result->assumed_strings_size)
{
result->assumed_strings_size += n;
- fail_if (xxrealloc(old, result->assumed_strings, result->assumed_strings_size, char*));
+ fail_if (xxrealloc(old, result->assumed_strings, result->assumed_strings_size, char32_t*));
}
/* Add all characters to the assumption list. */
@@ -1601,7 +1605,7 @@ static int compile_have_range(mds_kbdc_tree_assumption_have_range_t* restrict tr
if (result->assumed_strings_ptr + n > result->assumed_strings_size)
{
result->assumed_strings_size += n;
- fail_if (xxrealloc(old, result->assumed_strings, result->assumed_strings_size, char*));
+ fail_if (xxrealloc(old, result->assumed_strings, result->assumed_strings_size, char32_t*));
}
/* Add all characters to the assumption list. */