Re: [PATCH nft] src: remove opts field from struct xt_stmt

[Phil Sutter]

On Tue, Oct 16, 2018 at 08:58:20PM +0200, Pablo Neira Ayuso wrote:
> This is never used, ie. always NULL.
> 
> Reported-by: Phil Sutter 
> Signed-off-by: Pablo Neira Ayuso 

Acked-by: Phil Sutter 

Thanks for clearing this up!

[PATCH nft] src: remove opts field from struct xt_stmt

[Pablo Neira Ayuso]

This is never used, ie. always NULL.

Reported-by: Phil Sutter 
Signed-off-by: Pablo Neira Ayuso 
---
 include/statement.h | 1 -
 src/statement.c | 1 -
 src/xt.c| 8 ++--
 3 files changed, 2 insertions(+), 8 deletions(-)

diff --git a/include/statement.h b/include/statement.h
index 48ba6673553b..442405505072 100644
--- a/include/statement.h
+++ b/include/statement.h
@@ -237,7 +237,6 @@ struct xt_stmt {
struct xtables_match*match;
struct xtables_target   *target;
};
-   const char  *opts;
void*entry;
 };
 
diff --git a/src/statement.c b/src/statement.c
index 909f04ca382e..e50ac706402d 100644
--- a/src/statement.c
+++ b/src/statement.c
@@ -832,7 +832,6 @@ static void xt_stmt_print(const struct stmt *stmt, struct 
output_ctx *octx)
 static void xt_stmt_destroy(struct stmt *stmt)
 {
xfree(stmt->xt.name);
-   xfree(stmt->xt.opts);
xt_stmt_release(stmt);
 }
 
diff --git a/src/xt.c b/src/xt.c
index 95d0c5f24c07..74763d58cafd 100644
--- a/src/xt.c
+++ b/src/xt.c
@@ -32,9 +32,7 @@ void xt_stmt_xlate(const struct stmt *stmt)
 
switch (stmt->xt.type) {
case NFT_XT_MATCH:
-   if (stmt->xt.match == NULL && stmt->xt.opts) {
-   printf("%s", stmt->xt.opts);
-   } else if (stmt->xt.match->xlate) {
+   if (stmt->xt.match->xlate) {
struct xt_xlate_mt_params params = {
.ip = stmt->xt.entry,
.match  = stmt->xt.match->m,
@@ -51,9 +49,7 @@ void xt_stmt_xlate(const struct stmt *stmt)
break;
case NFT_XT_WATCHER:
case NFT_XT_TARGET:
-   if (stmt->xt.target == NULL && stmt->xt.opts) {
-   printf("%s", stmt->xt.opts);
-   } else if (stmt->xt.target->xlate) {
+   if (stmt->xt.target->xlate) {
struct xt_xlate_tg_params params = {
.ip = stmt->xt.entry,
.target = stmt->xt.target->t,
-- 
2.11.0