diff options
author | Roberto Ierusalimschy <roberto@inf.puc-rio.br> | 2014-01-09 14:21:28 -0200 |
---|---|---|
committer | Roberto Ierusalimschy <roberto@inf.puc-rio.br> | 2014-01-09 14:21:28 -0200 |
commit | 916bd874ad7270a89ae07fc76ddac00a34272fe9 (patch) | |
tree | ec1d03d008a43e66dd9d5bd21b7af7fca3eb09c9 /lstrlib.c | |
parent | cd848cab6bf59314d6b41625bbae918103f654db (diff) | |
download | lua-github-916bd874ad7270a89ae07fc76ddac00a34272fe9.tar.gz |
added explicit default options to string.pack/unpack functions
Diffstat (limited to 'lstrlib.c')
-rw-r--r-- | lstrlib.c | 14 |
1 files changed, 9 insertions, 5 deletions
@@ -1,5 +1,5 @@ /* -** $Id: lstrlib.c,v 1.183 2014/01/05 14:05:58 roberto Exp roberto $ +** $Id: lstrlib.c,v 1.184 2014/01/08 18:34:34 roberto Exp roberto $ ** Standard library for string operations and pattern-matching ** See Copyright Notice in lua.h */ @@ -970,14 +970,17 @@ static union { static int getendian (lua_State *L, int arg) { const char *endian = luaL_optstring(L, arg, (nativeendian.little ? "l" : "b")); + if (*endian == 'n') /* native? */ + return nativeendian.little; luaL_argcheck(L, *endian == 'l' || *endian == 'b', arg, - "endianess must be 'l' or 'b'"); + "endianess must be 'l'/'b'/'n'"); return (*endian == 'l'); } static int getintsize (lua_State *L, int arg) { - int size = luaL_optint(L, arg, SZINT); + int size = luaL_optint(L, arg, 0); + if (size == 0) size = SZINT; luaL_argcheck(L, 1 <= size && size <= MAXINTSIZE, arg, "integer size out of valid range"); return size; @@ -1087,9 +1090,10 @@ static void correctendianess (lua_State *L, char *b, int size, int endianarg) { (sizeof(lua_Number) == sizeof(float) ? "f" : "d") static int getfloatsize (lua_State *L, int arg) { - const char *size = luaL_optstring(L, arg, DEFAULTFLOATSIZE); + const char *size = luaL_optstring(L, arg, "n"); + if (*size == 'n') size = DEFAULTFLOATSIZE; luaL_argcheck(L, *size == 'd' || *size == 'f', arg, - "size must be 'f' or 'd'"); + "size must be 'f'/'d'/'n'"); return (*size == 'd' ? sizeof(double) : sizeof(float)); } |