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

CLEANUP: lua: fix confusing local variable naming in hlua_txn_new()

Browse Source 
Struct hlua_txn is called "htxn" or "ht" everywhere, while here it's
called "hs" which is the name used everywhere for struct "hlua_smp".
Such confusion participate to the dangers of copy-pasting code, so
let's fix the name here.
This commit is contained in:
Willy Tarreau 2015-04-06 11:04:28 +02:00
parent 07081fe6b7
commit de49138b9c
1 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
src/hlua.c
View File

@ -3318,7 +3318,7 @@ __LJMP static int hlua_get_priv(lua_State *L)
*/ */
static int hlua_txn_new(lua_State *L, struct session *s, struct proxy *p, void *l7) static int hlua_txn_new(lua_State *L, struct session *s, struct proxy *p, void *l7)
{ {
struct hlua_txn *hs; struct hlua_txn *htxn;
/* Check stack size. */ /* Check stack size. */
if (!lua_checkstack(L, 3)) if (!lua_checkstack(L, 3))
@ -3330,34 +3330,34 @@ static int hlua_txn_new(lua_State *L, struct session *s, struct proxy *p, void *
*/ */
/* Create the object: obj[0] = userdata. */ /* Create the object: obj[0] = userdata. */
lua_newtable(L); lua_newtable(L);
hs = lua_newuserdata(L, sizeof(*hs)); htxn = lua_newuserdata(L, sizeof(*htxn));
lua_rawseti(L, -2, 0); lua_rawseti(L, -2, 0);
hs->s = s; htxn->s = s;
hs->p = p; htxn->p = p;
hs->l7 = l7; htxn->l7 = l7;
/* Create the "f" field that contains a list of fetches. */ /* Create the "f" field that contains a list of fetches. */
lua_pushstring(L, "f"); lua_pushstring(L, "f");
if (!hlua_fetches_new(L, hs, 0)) if (!hlua_fetches_new(L, htxn, 0))
return 0; return 0;
lua_settable(L, -3); lua_settable(L, -3);
/* Create the "sf" field that contains a list of stringsafe fetches. */ /* Create the "sf" field that contains a list of stringsafe fetches. */
lua_pushstring(L, "sf"); lua_pushstring(L, "sf");
if (!hlua_fetches_new(L, hs, 1)) if (!hlua_fetches_new(L, htxn, 1))
return 0; return 0;
lua_settable(L, -3); lua_settable(L, -3);
/* Create the "c" field that contains a list of converters. */ /* Create the "c" field that contains a list of converters. */
lua_pushstring(L, "c"); lua_pushstring(L, "c");
if (!hlua_converters_new(L, hs, 0)) if (!hlua_converters_new(L, htxn, 0))
return 0; return 0;
lua_settable(L, -3); lua_settable(L, -3);
/* Create the "sc" field that contains a list of stringsafe converters. */ /* Create the "sc" field that contains a list of stringsafe converters. */
lua_pushstring(L, "sc"); lua_pushstring(L, "sc");
if (!hlua_converters_new(L, hs, 1)) if (!hlua_converters_new(L, htxn, 1))
return 0; return 0;
lua_settable(L, -3); lua_settable(L, -3);
@ -3376,7 +3376,7 @@ static int hlua_txn_new(lua_State *L, struct session *s, struct proxy *p, void *
/* Creates the HTTP object is the current proxy allows http. */ /* Creates the HTTP object is the current proxy allows http. */
lua_pushstring(L, "http"); lua_pushstring(L, "http");
if (p->mode == PR_MODE_HTTP) { if (p->mode == PR_MODE_HTTP) {
if (!hlua_http_new(L, hs)) if (!hlua_http_new(L, htxn))
return 0; return 0;
} }
else else