mirrors/lua
1
0
Fork 0
mirror of https://github.com/lua/lua synced 2024-12-28 13:19:44 +03:00
Code Issues Packages Projects Releases Wiki Activity

details (avoid some 'lint' warnings)

Browse Source
This commit is contained in:
Roberto Ierusalimschy 2015-03-28 16:16:55 -03:00
parent e723c75c02
commit f2a813ae10
1 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
lutf8lib.c
View File

@ -1,5 +1,5 @@
/* /*
** $Id: lutf8lib.c,v 1.13 2014/11/02 19:19:04 roberto Exp roberto $ ** $Id: lutf8lib.c,v 1.14 2015/03/05 16:07:46 roberto Exp roberto $
** Standard library for UTF-8 manipulation ** Standard library for UTF-8 manipulation
** See Copyright Notice in lua.h ** See Copyright Notice in lua.h
*/ */
@ -11,6 +11,7 @@
#include <assert.h> #include <assert.h>
#include <limits.h>
#include <stdlib.h> #include <stdlib.h>
#include <string.h> #include <string.h>
@ -37,7 +38,7 @@ static lua_Integer u_posrelat (lua_Integer pos, size_t len) {
** Decode one UTF-8 sequence, returning NULL if byte sequence is invalid. ** Decode one UTF-8 sequence, returning NULL if byte sequence is invalid.
*/ */
static const char *utf8_decode (const char *o, int *val) { static const char *utf8_decode (const char *o, int *val) {
static unsigned int limits[] = {0xFF, 0x7F, 0x7FF, 0xFFFF}; static const unsigned int limits[] = {0xFF, 0x7F, 0x7FF, 0xFFFF};
const unsigned char *s = (const unsigned char *)o; const unsigned char *s = (const unsigned char *)o;
unsigned int c = s[0]; unsigned int c = s[0];
unsigned int res = 0; /* final result */ unsigned int res = 0; /* final result */
@ -106,9 +107,9 @@ static int codepoint (lua_State *L) {
luaL_argcheck(L, posi >= 1, 2, "out of range"); luaL_argcheck(L, posi >= 1, 2, "out of range");
luaL_argcheck(L, pose <= (lua_Integer)len, 3, "out of range"); luaL_argcheck(L, pose <= (lua_Integer)len, 3, "out of range");
if (posi > pose) return 0; /* empty interval; return no values */ if (posi > pose) return 0; /* empty interval; return no values */
n = (int)(pose - posi + 1); if (pose - posi >= INT_MAX) /* (lua_Integer -> int) overflow? */
if (posi + n <= pose) /* (lua_Integer -> int) overflow? */
return luaL_error(L, "string slice too long"); return luaL_error(L, "string slice too long");
n = (int)(pose - posi) + 1;
luaL_checkstack(L, n, "string slice too long"); luaL_checkstack(L, n, "string slice too long");
n = 0; n = 0;
se = s + pose; se = s + pose;
@ -234,7 +235,7 @@ static int iter_codes (lua_State *L) {
#define UTF8PATT "[\0-\x7F\xC2-\xF4][\x80-\xBF]*" #define UTF8PATT "[\0-\x7F\xC2-\xF4][\x80-\xBF]*"
static struct luaL_Reg funcs[] = { static const luaL_Reg funcs[] = {
{"offset", byteoffset}, {"offset", byteoffset},
{"codepoint", codepoint}, {"codepoint", codepoint},
{"char", utfchar}, {"char", utfchar},