Scripting: Simplify console implementation

This commit is contained in:
Vicki Pfau 2023-09-16 01:20:34 -07:00
parent 805773aa8f
commit 0c675b12e4
1 changed files with 12 additions and 12 deletions

View File

@ -1247,33 +1247,33 @@ static struct mScriptTextBuffer* _mScriptConsoleCreateBuffer(struct mScriptConso
return buffer; return buffer;
} }
static void mScriptConsoleLog(struct mScriptConsole* console, struct mScriptString* msg) { static void mScriptConsoleLog(struct mScriptConsole* console, const char* msg) {
if (console->logger) { if (console->logger) {
mLogExplicit(console->logger, _mLOG_CAT_SCRIPT, mLOG_INFO, "%s", msg->buffer); mLogExplicit(console->logger, _mLOG_CAT_SCRIPT, mLOG_INFO, "%s", msg);
} else { } else {
mLog(_mLOG_CAT_SCRIPT, mLOG_INFO, "%s", msg->buffer); mLog(_mLOG_CAT_SCRIPT, mLOG_INFO, "%s", msg);
} }
} }
static void mScriptConsoleWarn(struct mScriptConsole* console, struct mScriptString* msg) { static void mScriptConsoleWarn(struct mScriptConsole* console, const char* msg) {
if (console->logger) { if (console->logger) {
mLogExplicit(console->logger, _mLOG_CAT_SCRIPT, mLOG_WARN, "%s", msg->buffer); mLogExplicit(console->logger, _mLOG_CAT_SCRIPT, mLOG_WARN, "%s", msg);
} else { } else {
mLog(_mLOG_CAT_SCRIPT, mLOG_WARN, "%s", msg->buffer); mLog(_mLOG_CAT_SCRIPT, mLOG_WARN, "%s", msg);
} }
} }
static void mScriptConsoleError(struct mScriptConsole* console, struct mScriptString* msg) { static void mScriptConsoleError(struct mScriptConsole* console, const char* msg) {
if (console->logger) { if (console->logger) {
mLogExplicit(console->logger, _mLOG_CAT_SCRIPT, mLOG_ERROR, "%s", msg->buffer); mLogExplicit(console->logger, _mLOG_CAT_SCRIPT, mLOG_ERROR, "%s", msg);
} else { } else {
mLog(_mLOG_CAT_SCRIPT, mLOG_ERROR, "%s", msg->buffer); mLog(_mLOG_CAT_SCRIPT, mLOG_ERROR, "%s", msg);
} }
} }
mSCRIPT_DECLARE_STRUCT_VOID_METHOD(mScriptConsole, log, mScriptConsoleLog, 1, STR, msg); mSCRIPT_DECLARE_STRUCT_VOID_METHOD(mScriptConsole, log, mScriptConsoleLog, 1, CHARP, msg);
mSCRIPT_DECLARE_STRUCT_VOID_METHOD(mScriptConsole, warn, mScriptConsoleWarn, 1, STR, msg); mSCRIPT_DECLARE_STRUCT_VOID_METHOD(mScriptConsole, warn, mScriptConsoleWarn, 1, CHARP, msg);
mSCRIPT_DECLARE_STRUCT_VOID_METHOD(mScriptConsole, error, mScriptConsoleError, 1, STR, msg); mSCRIPT_DECLARE_STRUCT_VOID_METHOD(mScriptConsole, error, mScriptConsoleError, 1, CHARP, msg);
mSCRIPT_DECLARE_STRUCT_METHOD_WITH_DEFAULTS(mScriptConsole, S(mScriptTextBuffer), createBuffer, _mScriptConsoleCreateBuffer, 1, CHARP, name); mSCRIPT_DECLARE_STRUCT_METHOD_WITH_DEFAULTS(mScriptConsole, S(mScriptTextBuffer), createBuffer, _mScriptConsoleCreateBuffer, 1, CHARP, name);
mSCRIPT_DEFINE_STRUCT(mScriptConsole) mSCRIPT_DEFINE_STRUCT(mScriptConsole)