From: Willy Tarreau <w@1wt.eu>
Date: Fri, 3 Apr 2015 22:56:08 +0000 (+0200)
Subject: CLEANUP: lua: remove unused hlua_smp->l7 and hlua_txn->l7
X-Git-Tag: v1.6-dev2~265
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=f3bf3050a100b5bf0f4eb297cea633cfcfbfa291;p=thirdparty%2Fhaproxy.git

CLEANUP: lua: remove unused hlua_smp->l7 and hlua_txn->l7

Since last commit, we don't retrieve the HTTP transaction from there
anymore, so these entries can go.
---

diff --git a/include/types/hlua.h b/include/types/hlua.h
index 13465d8a4a..82e80c4fd1 100644
--- a/include/types/hlua.h
+++ b/include/types/hlua.h
@@ -93,14 +93,12 @@ struct hlua_rule {
 struct hlua_txn {
 	struct stream *s;
 	struct proxy *p;
-	void *l7;
 };
 
 /* This struc is used with sample fetches and sample converters. */
 struct hlua_smp {
 	struct stream *s;
 	struct proxy *p;
-	void *l7;
 	int stringsafe;
 };
 
diff --git a/src/hlua.c b/src/hlua.c
index 320a0bf601..b278e11631 100644
--- a/src/hlua.c
+++ b/src/hlua.c
@@ -2718,7 +2718,6 @@ static int hlua_fetches_new(lua_State *L, struct hlua_txn *txn, int stringsafe)
 
 	hsmp->s = txn->s;
 	hsmp->p = txn->p;
-	hsmp->l7 = txn->l7;
 	hsmp->stringsafe = stringsafe;
 
 	/* Pop a class sesison metatable and affect it to the userdata. */
@@ -2822,7 +2821,6 @@ static int hlua_converters_new(lua_State *L, struct hlua_txn *txn, int stringsaf
 
 	hsmp->s = txn->s;
 	hsmp->p = txn->p;
-	hsmp->l7 = txn->l7;
 	hsmp->stringsafe = stringsafe;
 
 	/* Pop a class stream metatable and affect it to the table. */
@@ -2941,7 +2939,6 @@ static int hlua_http_new(lua_State *L, struct hlua_txn *txn)
 
 	htxn->s = txn->s;
 	htxn->p = txn->p;
-	htxn->l7 = txn->l7;
 
 	/* Pop a class stream metatable and affect it to the table. */
 	lua_rawgeti(L, LUA_REGISTRYINDEX, class_http_ref);
@@ -3342,7 +3339,6 @@ static int hlua_txn_new(lua_State *L, struct stream *s, struct proxy *p)
 
 	htxn->s = s;
 	htxn->p = p;
-	htxn->l7 = s->txn;
 
 	/* Create the "f" field that contains a list of fetches. */
 	lua_pushstring(L, "f");