RepoMirrors/haproxy
1
0
Fork 0
mirror of http://git.haproxy.org/git/haproxy.git/ synced 2025-02-12 08:27:24 +00:00
Code Issues Packages Projects Releases Wiki Activity

CLEANUP: lua: rename variable "sc" for struct hlua_smp

Browse Source 
It's unclear where this name comes from, but better rename it now to "hsmp"
to be in line with the rest of the code.
This commit is contained in:
Willy Tarreau 2015-04-06 11:17:13 +02:00
parent bcb39cc339
commit da5f10827b
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/hlua.c
View File

@ -2836,7 +2836,7 @@ static int hlua_converters_new(lua_State *L, struct hlua_txn *txn, int stringsaf
*/
__LJMP static int hlua_run_sample_conv(lua_State *L)
{
struct hlua_smp *sc;
struct hlua_smp *hsmp;
struct sample_conv *conv;
struct arg args[ARGM_NBARGS + 1];
int i;
@ -2846,7 +2846,7 @@ __LJMP static int hlua_run_sample_conv(lua_State *L)
conv = (struct sample_conv *)lua_touserdata(L, lua_upvalueindex(1));
/* Get traditionnal arguments. */
sc = MAY_LJMP(hlua_checkconverters(L, 1));
hsmp = MAY_LJMP(hlua_checkconverters(L, 1));
/* Get extra arguments. */
for (i = 0; i < lua_gettop(L) - 2; i++) {
@ -2857,7 +2857,7 @@ __LJMP static int hlua_run_sample_conv(lua_State *L)
args[i].type = ARGT_STOP;
/* Check arguments. */
MAY_LJMP(hlua_lua2arg_check(L, 3, args, conv->arg_mask, sc->p));
MAY_LJMP(hlua_lua2arg_check(L, 3, args, conv->arg_mask, hsmp->p));
/* Run the special args checker. */
if (conv->val_args && !conv->val_args(args, conv, "", 0, NULL)) {
@ -2884,8 +2884,8 @@ __LJMP static int hlua_run_sample_conv(lua_State *L)
}
/* Run the sample conversion process. */
if (!conv->process(sc->s, args, &smp, conv->private)) {
if (sc->stringsafe)
if (!conv->process(hsmp->s, args, &smp, conv->private)) {
if (hsmp->stringsafe)
lua_pushstring(L, "");
else
lua_pushnil(L);
@ -2893,7 +2893,7 @@ __LJMP static int hlua_run_sample_conv(lua_State *L)
}
/* Convert the returned sample in lua value. */
if (sc->stringsafe)
if (hsmp->stringsafe)
hlua_smp2lua_str(L, &smp);
else
hlua_smp2lua(L, &smp);