18fd73d348
- arptables-nft-helper: Remove bashisms - ebtables-helper: Drop unused variable, add a missing quote - extensions: libxt_string: Avoid buffer size warning for strncpy() - libxtables: Introduce xtables_strdup() and use it everywhere - extensions: libebt_ip6: Use xtables_ip6parse_any() - iptables-apply: Drop unused variable - nft: Avoid buffer size warnings copying iface names - nft: Avoid memleak in error path of nft_cmd_new() - libxtables: Fix memleak in xtopt_parse_hostmask() - extensions: libebt_ip6: Drop unused variables - libxtables: Drop leftover variable in xtables_numeric_to_ip6addr() Resolves: RHBZ#1938745
34 lines
1.0 KiB
Diff
34 lines
1.0 KiB
Diff
From 5432b8f6fb2c3643bd06a965ae99d52d84b4fa10 Mon Sep 17 00:00:00 2001
|
|
From: Phil Sutter <phil@nwl.cc>
|
|
Date: Fri, 13 Nov 2020 21:04:39 +0100
|
|
Subject: [PATCH] libxtables: Drop leftover variable in
|
|
xtables_numeric_to_ip6addr()
|
|
|
|
Variable 'err' was only used in removed debug code, so drop it as well.
|
|
|
|
Fixes: 7f526c9373c17 ("libxtables: xtables: remove unnecessary debug code")
|
|
Signed-off-by: Phil Sutter <phil@nwl.cc>
|
|
(cherry picked from commit 97fabae738a74bd04a7793e1199cd2b8a69122bc)
|
|
---
|
|
libxtables/xtables.c | 3 +--
|
|
1 file changed, 1 insertion(+), 2 deletions(-)
|
|
|
|
diff --git a/libxtables/xtables.c b/libxtables/xtables.c
|
|
index bc42ba8221f3a..6947441fec659 100644
|
|
--- a/libxtables/xtables.c
|
|
+++ b/libxtables/xtables.c
|
|
@@ -1812,9 +1812,8 @@ const char *xtables_ip6mask_to_numeric(const struct in6_addr *addrp)
|
|
struct in6_addr *xtables_numeric_to_ip6addr(const char *num)
|
|
{
|
|
static struct in6_addr ap;
|
|
- int err;
|
|
|
|
- if ((err = inet_pton(AF_INET6, num, &ap)) == 1)
|
|
+ if (inet_pton(AF_INET6, num, &ap) == 1)
|
|
return ≈
|
|
|
|
return NULL;
|
|
--
|
|
2.31.1
|
|
|