From 6a95f6deb510f0b2593aec79031091f75b3620a6 Mon Sep 17 00:00:00 2001 From: Josh Yelon Date: Thu, 21 Oct 2021 13:49:28 -0400 Subject: [PATCH] eris: get rid of hooks for luai_writestring. --- luprex/eris-master/src/lua.c | 9 --------- luprex/eris-master/src/luaconf.h | 6 +++--- luprex/eris-master/test/persist.c | 9 --------- luprex/eris-master/test/unpersist.c | 9 --------- 4 files changed, 3 insertions(+), 30 deletions(-) diff --git a/luprex/eris-master/src/lua.c b/luprex/eris-master/src/lua.c index 540c6e6f..3b009fa0 100644 --- a/luprex/eris-master/src/lua.c +++ b/luprex/eris-master/src/lua.c @@ -83,15 +83,6 @@ #endif -void luai_writestring(const char *s, size_t len) { - fwrite((s), sizeof(char), (len), stdout); -} - -void luai_writeline() { - fwrite("\n", sizeof(char), 1, stdout); - fflush(stdout); -} - static lua_State *globalL = NULL; static const char *progname = LUA_PROGNAME; diff --git a/luprex/eris-master/src/luaconf.h b/luprex/eris-master/src/luaconf.h index 730dae6c..e5e103cc 100644 --- a/luprex/eris-master/src/luaconf.h +++ b/luprex/eris-master/src/luaconf.h @@ -210,8 +210,9 @@ ** avoids including 'stdio.h' everywhere.) */ #if defined(LUA_LIB) || defined(lua_c) -extern void luai_writestring(const char *s, size_t len); -extern void luai_writeline(); +#include +#define luai_writestring(s,l) fwrite((s), sizeof(char), (l), stdout) +#define luai_writeline() (luai_writestring("\n", 1), fflush(stdout)) #endif /* @@ -221,7 +222,6 @@ extern void luai_writeline(); #define luai_writestringerror(s,p) \ (fprintf(stderr, (s), (p)), fflush(stderr)) - /* @@ LUAI_MAXSHORTLEN is the maximum length for short strings, that is, ** strings that are internalized. (Cannot be smaller than reserved words diff --git a/luprex/eris-master/test/persist.c b/luprex/eris-master/test/persist.c index 24fbbcbb..4f52de43 100644 --- a/luprex/eris-master/test/persist.c +++ b/luprex/eris-master/test/persist.c @@ -5,15 +5,6 @@ #include "lualib.h" #include "lauxlib.h" -void luai_writestring(const char *s, size_t len) { - fwrite((s), sizeof(char), (len), stdout); -} - -void luai_writeline() { - fwrite("\n", sizeof(char), 1, stdout); - fflush(stdout); -} - static int LUAF_createludata(lua_State *L) { lua_pushlightuserdata(L, (void*)321); diff --git a/luprex/eris-master/test/unpersist.c b/luprex/eris-master/test/unpersist.c index f70562c8..19d312ae 100644 --- a/luprex/eris-master/test/unpersist.c +++ b/luprex/eris-master/test/unpersist.c @@ -5,15 +5,6 @@ #include "lualib.h" #include "lauxlib.h" -void luai_writestring(const char *s, size_t len) { - fwrite((s), sizeof(char), (len), stdout); -} - -void luai_writeline() { - fwrite("\n", sizeof(char), 1, stdout); - fflush(stdout); -} - static int LUAF_checkludata(lua_State *L) { lua_pushboolean(L, lua_touserdata(L, -1) == (void*)321);