summaryrefslogtreecommitdiff
path: root/src/utf8.c
diff options
context:
space:
mode:
authorJörg Frings-Fürst <debian@jff-webhosting.net>2017-12-28 16:46:11 +0100
committerJörg Frings-Fürst <debian@jff-webhosting.net>2017-12-28 16:46:11 +0100
commit5587db012cd0e8f69f811e8959a861112904136a (patch)
tree19472bb8b64980a43e99340ba899cd442a824445 /src/utf8.c
parentfa131e9ad996d099bb48a3b1302e4a3b3c0f03bd (diff)
parent4bf99bd2fb7b6bde65a11dfce43ed399ecb10ccd (diff)
Merge branch 'release/6.7.0-1'6.7.0-1
Diffstat (limited to 'src/utf8.c')
-rw-r--r--src/utf8.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/utf8.c b/src/utf8.c
index 1ad9653..e5e59b2 100644
--- a/src/utf8.c
+++ b/src/utf8.c
@@ -2,7 +2,7 @@
utf8.c - Oniguruma (regular expression library)
**********************************************************************/
/*-
- * Copyright (c) 2002-2016 K.Kosako <sndgk393 AT ybb DOT ne DOT jp>
+ * Copyright (c) 2002-2017 K.Kosako <sndgk393 AT ybb DOT ne DOT jp>
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
@@ -124,7 +124,7 @@ mbc_to_code(const UChar* p, const UChar* end)
OnigCodePoint n;
len = mbc_enc_len(p);
- if (len > end - p) len = end - p;
+ if (len > (int )(end - p)) len = (int )(end - p);
c = *p++;
if (len > 1) {
@@ -216,7 +216,7 @@ code_to_mbc(OnigCodePoint code, UChar *buf)
}
*p++ = UTF8_TRAIL0(code);
- return p - buf;
+ return (int )(p - buf);
}
}