rusefi
/
lua
mirror of https://github.com/rusefi/lua.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Details 

- Removed unused (and trivial) definition LUA_UNSIGNEDBITS
- Alignment structure in pack/unpack moved to a narrower scope
This commit is contained in:
Roberto Ierusalimschy 2021-05-24 16:48:09 -03:00
parent 681297187e
commit 1e6918d553
2 changed files with 7 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
lstrlib.c
View File

@ -1352,15 +1352,6 @@ static const union {
} nativeendian = {1}; } nativeendian = {1};
/* dummy structure to get native alignment requirements */
struct cD {
char c;
union { double d; void *p; lua_Integer i; lua_Number n; } u;
};
#define MAXALIGN (offsetof(struct cD, u))
/* /*
** information to pack/unpack stuff ** information to pack/unpack stuff
*/ */
@ -1435,6 +1426,8 @@ static void initheader (lua_State *L, Header *h) {
** Read and classify next option. 'size' is filled with option's size. ** Read and classify next option. 'size' is filled with option's size.
*/ */
static KOption getoption (Header *h, const char **fmt, int *size) { static KOption getoption (Header *h, const char **fmt, int *size) {
/* dummy structure to get native alignment requirements */
struct cD { char c; union { LUAI_MAXALIGN; } u; };
int opt = *((*fmt)++); int opt = *((*fmt)++);
*size = 0; /* default */ *size = 0; /* default */
switch (opt) { switch (opt) {
@ -1465,7 +1458,11 @@ static KOption getoption (Header *h, const char **fmt, int *size) {
case '<': h->islittle = 1; break; case '<': h->islittle = 1; break;
case '>': h->islittle = 0; break; case '>': h->islittle = 0; break;
case '=': h->islittle = nativeendian.little; break; case '=': h->islittle = nativeendian.little; break;
case '!': h->maxalign = getnumlimit(h, fmt, MAXALIGN); break; case '!': {
const int maxalign = offsetof(struct cD, u);
h->maxalign = getnumlimit(h, fmt, maxalign);
break;
}
default: luaL_error(h->L, "invalid format option '%c'", opt); default: luaL_error(h->L, "invalid format option '%c'", opt);
} }
return Knop; return Knop;

4
luaconf.h
View File

@ -485,7 +485,6 @@
@@ LUA_MAXINTEGER is the maximum value for a LUA_INTEGER. @@ LUA_MAXINTEGER is the maximum value for a LUA_INTEGER.
@@ LUA_MININTEGER is the minimum value for a LUA_INTEGER. @@ LUA_MININTEGER is the minimum value for a LUA_INTEGER.
@@ LUA_MAXUNSIGNED is the maximum value for a LUA_UNSIGNED. @@ LUA_MAXUNSIGNED is the maximum value for a LUA_UNSIGNED.
@@ LUA_UNSIGNEDBITS is the number of bits in a LUA_UNSIGNED.
@@ lua_integer2str converts an integer to a string. @@ lua_integer2str converts an integer to a string.
*/ */
@ -506,9 +505,6 @@
#define LUA_UNSIGNED unsigned LUAI_UACINT #define LUA_UNSIGNED unsigned LUAI_UACINT
#define LUA_UNSIGNEDBITS (sizeof(LUA_UNSIGNED) * CHAR_BIT)
/* now the variable definitions */ /* now the variable definitions */
#if LUA_INT_TYPE == LUA_INT_INT /* { int */ #if LUA_INT_TYPE == LUA_INT_INT /* { int */