summaryrefslogtreecommitdiff
path: root/src/unicode_unfold_key.c
diff options
context:
space:
mode:
authorJörg Frings-Fürst <debian@jff-webhosting.net>2017-06-25 09:54:19 +0200
committerJörg Frings-Fürst <debian@jff-webhosting.net>2017-06-25 09:54:19 +0200
commit49ce5df5ac9c855bef26106c3e870f391a44dce2 (patch)
tree57ec61c31f78449949c85891024ebecc19aa1242 /src/unicode_unfold_key.c
parent0e4c1c1dd3dd4271e54a7305699c303b629fa915 (diff)
parent3ef49f8de6794777791fdc48ee4b73926ea51e1a (diff)
Merge branch 'feature/upstream' into develop
Diffstat (limited to 'src/unicode_unfold_key.c')
-rw-r--r--src/unicode_unfold_key.c14
1 files changed, 10 insertions, 4 deletions
diff --git a/src/unicode_unfold_key.c b/src/unicode_unfold_key.c
index c6261d2..15302ca 100644
--- a/src/unicode_unfold_key.c
+++ b/src/unicode_unfold_key.c
@@ -1,7 +1,7 @@
/* This file was converted by gperf_unfold_key_conv.py
from gperf output file. */
-/* ANSI-C code produced by gperf version 3.0.3 */
-/* Command-line: /Library/Developer/CommandLineTools/usr/bin/gperf -n -C -T -c -t -j1 -L ANSI-C -F,-1,0 -N unicode_unfold_key unicode_unfold_key.gperf */
+/* ANSI-C code produced by gperf version 3.0.4 */
+/* Command-line: gperf -n -C -T -c -t -j1 -L ANSI-C -F,-1,0 -N unicode_unfold_key unicode_unfold_key.gperf */
/* Computed positions: -k'1-3' */
@@ -64,6 +64,12 @@ hash(OnigCodePoint codes[])
return asso_values[(unsigned char)onig_codes_byte_at(codes, 2)+35] + asso_values[(unsigned char)onig_codes_byte_at(codes, 1)+1] + asso_values[(unsigned char)onig_codes_byte_at(codes, 0)];
}
+#ifdef __GNUC__
+__inline
+#if defined __GNUC_STDC_INLINE__ || defined __GNUC_GNU_INLINE__
+__attribute__ ((__gnu_inline__))
+#endif
+#endif
const struct ByUnfoldKey *
unicode_unfold_key(OnigCodePoint code)
{
@@ -2840,11 +2846,11 @@ unicode_unfold_key(OnigCodePoint code)
{
int key = hash(&code);
- if (key <= MAX_HASH_VALUE)
+ if (key <= MAX_HASH_VALUE && key >= 0)
{
OnigCodePoint gcode = wordlist[key].code;
- if (code == gcode)
+ if (code == gcode && wordlist[key].index >= 0)
return &wordlist[key];
}
}