|
@@ -742,7 +742,7 @@ typedef struct LoadF {
|
|
|
|
|
|
|
|
static const char *getF (lua_State *L, void *ud, size_t *size) {
|
|
static const char *getF (lua_State *L, void *ud, size_t *size) {
|
|
|
LoadF *lf = (LoadF *)ud;
|
|
LoadF *lf = (LoadF *)ud;
|
|
|
- (void)L; /* not used */
|
|
|
|
|
|
|
+ UNUSED(L);
|
|
|
if (lf->n > 0) { /* are there pre-read characters to be read? */
|
|
if (lf->n > 0) { /* are there pre-read characters to be read? */
|
|
|
*size = lf->n; /* return them (chars already in buffer) */
|
|
*size = lf->n; /* return them (chars already in buffer) */
|
|
|
lf->n = 0; /* no more pre-read characters */
|
|
lf->n = 0; /* no more pre-read characters */
|
|
@@ -856,7 +856,7 @@ typedef struct LoadS {
|
|
|
|
|
|
|
|
static const char *getS (lua_State *L, void *ud, size_t *size) {
|
|
static const char *getS (lua_State *L, void *ud, size_t *size) {
|
|
|
LoadS *ls = (LoadS *)ud;
|
|
LoadS *ls = (LoadS *)ud;
|
|
|
- (void)L; /* not used */
|
|
|
|
|
|
|
+ UNUSED(L);
|
|
|
if (ls->size == 0) return NULL;
|
|
if (ls->size == 0) return NULL;
|
|
|
*size = ls->size;
|
|
*size = ls->size;
|
|
|
ls->size = 0;
|
|
ls->size = 0;
|
|
@@ -1046,8 +1046,8 @@ LUALIB_API const char *luaL_gsub (lua_State *L, const char *s,
|
|
|
}
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
-static void *l_alloc (void *ud, void *ptr, size_t osize, size_t nsize) {
|
|
|
|
|
- (void)ud; (void)osize; /* not used */
|
|
|
|
|
|
|
+void *luaL_alloc (void *ud, void *ptr, size_t osize, size_t nsize) {
|
|
|
|
|
+ UNUSED(ud); UNUSED(osize);
|
|
|
if (nsize == 0) {
|
|
if (nsize == 0) {
|
|
|
free(ptr);
|
|
free(ptr);
|
|
|
return NULL;
|
|
return NULL;
|
|
@@ -1172,7 +1172,7 @@ static unsigned int luai_makeseed (void) {
|
|
|
|
|
|
|
|
|
|
|
|
|
LUALIB_API unsigned int luaL_makeseed (lua_State *L) {
|
|
LUALIB_API unsigned int luaL_makeseed (lua_State *L) {
|
|
|
- (void)L; /* unused */
|
|
|
|
|
|
|
+ UNUSED(L);
|
|
|
return luai_makeseed();
|
|
return luai_makeseed();
|
|
|
}
|
|
}
|
|
|
|
|
|
|
@@ -1182,7 +1182,7 @@ LUALIB_API unsigned int luaL_makeseed (lua_State *L) {
|
|
|
** as a macro.
|
|
** as a macro.
|
|
|
*/
|
|
*/
|
|
|
LUALIB_API lua_State *(luaL_newstate) (void) {
|
|
LUALIB_API lua_State *(luaL_newstate) (void) {
|
|
|
- lua_State *L = lua_newstate(l_alloc, NULL, luai_makeseed());
|
|
|
|
|
|
|
+ lua_State *L = lua_newstate(luaL_alloc, NULL, luaL_makeseed(NULL));
|
|
|
if (l_likely(L)) {
|
|
if (l_likely(L)) {
|
|
|
lua_atpanic(L, &panic);
|
|
lua_atpanic(L, &panic);
|
|
|
lua_setwarnf(L, warnfoff, L); /* default is warnings off */
|
|
lua_setwarnf(L, warnfoff, L); /* default is warnings off */
|