proxmox-mirrors/mirror_frr
1
0
Fork 0
mirror of https://git.proxmox.com/git/mirror_frr synced 2025-08-05 22:50:14 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #9273 from dlqs/luadofilefix

Browse Source 
lib: Fix dead code from lua_dofile
This commit is contained in:
Quentin Young 2021-08-09 09:55:35 -04:00 committed by GitHub
commit edc6ea2ec5
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 4 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
lib/frrscript.c
View File

@ -281,40 +281,12 @@ int frrscript_load(struct frrscript *fs, const char *function_name,
scriptdir, fs->name);
goto fail;
}
int ret = luaL_dofile(L, script_name);
switch (ret) {
case LUA_OK:
break;
case LUA_ERRSYNTAX:
zlog_err(
"frrscript: failed loading script '%s.lua': syntax error: %s",
script_name, lua_tostring(L, -1));
break;
case LUA_ERRMEM:
zlog_err(
"frrscript: failed loading script '%s.lua': out-of-memory error: %s",
script_name, lua_tostring(L, -1));
break;
case LUA_ERRGCMM:
zlog_err(
"frrscript: failed loading script '%s.lua': garbage collector error: %s",
script_name, lua_tostring(L, -1));
break;
case LUA_ERRFILE:
zlog_err(
"frrscript: failed loading script '%s.lua': file read error: %s",
script_name, lua_tostring(L, -1));
break;
default:
zlog_err(
"frrscript: failed loading script '%s.lua': unknown error: %s",
script_name, lua_tostring(L, -1));
break;
}
if (ret != LUA_OK)
if (luaL_dofile(L, script_name) != 0) {
zlog_err("frrscript: failed loading script '%s.lua': error: %s",
script_name, lua_tostring(L, -1));
goto fail;
}
/* Push the Lua function we want */
lua_getglobal(L, function_name);