mirrors/haproxy
1
0
Fork 0
mirror of https://git.haproxy.org/git/haproxy.git/ synced 2025-09-22 14:21:25 +02:00
Code Issues Projects Releases Wiki Activity

MINOR: lua-thread: remove struct hlua from function hlua_prepend_path()

Browse Source 
The goal is to no longer use "struct hlua" with global main lua_state
and directly take the state instead.

This patch removes the implicit dependency to this struct with
the function hlua_prepend_path()
This commit is contained in:
Thierry Fournier 2020-11-28 10:13:12 +01:00 committed by Willy Tarreau
parent cdb53465f4
commit 3fb9e5133a
1 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
src/hlua.c
View File

@ -8117,15 +8117,15 @@ static int hlua_load(char **args, int section_type, struct proxy *curpx,
/* Prepend the given <path> followed by a semicolon to the `package.<type>` variable /* Prepend the given <path> followed by a semicolon to the `package.<type>` variable
* in the given <ctx>. * in the given <ctx>.
*/ */
static int hlua_prepend_path(struct hlua ctx, char *type, char *path) static int hlua_prepend_path(lua_State *L, char *type, char *path)
{ {
lua_getglobal(ctx.T, "package"); /* push package variable */ lua_getglobal(L, "package"); /* push package variable */
lua_pushstring(ctx.T, path); /* push given path */ lua_pushstring(L, path); /* push given path */
lua_pushstring(ctx.T, ";"); /* push semicolon */ lua_pushstring(L, ";"); /* push semicolon */
lua_getfield(ctx.T, -3, type); /* push old path */ lua_getfield(L, -3, type); /* push old path */
lua_concat(ctx.T, 3); /* concatenate to new path */ lua_concat(L, 3); /* concatenate to new path */
lua_setfield(ctx.T, -2, type); /* store new path */ lua_setfield(L, -2, type); /* store new path */
lua_pop(ctx.T, 1); /* pop package variable */ lua_pop(L, 1); /* pop package variable */
return 0; return 0;
} }
@ -8154,7 +8154,7 @@ static int hlua_config_prepend_path(char **args, int section_type, struct proxy
type = args[2]; type = args[2];
} }
return hlua_prepend_path(gL, type, path); return hlua_prepend_path(gL.T, type, path);
} }
/* configuration keywords declaration */ /* configuration keywords declaration */
@ -8326,10 +8326,10 @@ void hlua_init(void)
#define HLUA_PREPEND_PATH_TOSTRING1(x) #x #define HLUA_PREPEND_PATH_TOSTRING1(x) #x
#define HLUA_PREPEND_PATH_TOSTRING(x) HLUA_PREPEND_PATH_TOSTRING1(x) #define HLUA_PREPEND_PATH_TOSTRING(x) HLUA_PREPEND_PATH_TOSTRING1(x)
#ifdef HLUA_PREPEND_PATH #ifdef HLUA_PREPEND_PATH
hlua_prepend_path(gL, "path", HLUA_PREPEND_PATH_TOSTRING(HLUA_PREPEND_PATH)); hlua_prepend_path(gL.T, "path", HLUA_PREPEND_PATH_TOSTRING(HLUA_PREPEND_PATH));
#endif #endif
#ifdef HLUA_PREPEND_CPATH #ifdef HLUA_PREPEND_CPATH
hlua_prepend_path(gL, "cpath", HLUA_PREPEND_PATH_TOSTRING(HLUA_PREPEND_CPATH)); hlua_prepend_path(gL.T, "cpath", HLUA_PREPEND_PATH_TOSTRING(HLUA_PREPEND_CPATH));
#endif #endif
#undef HLUA_PREPEND_PATH_TOSTRING #undef HLUA_PREPEND_PATH_TOSTRING
#undef HLUA_PREPEND_PATH_TOSTRING1 #undef HLUA_PREPEND_PATH_TOSTRING1