diff mbox series

treewide: use uint* instead of u_int*

Message ID 20220516064754.204416-1-vincent@systemli.org
State Changes Requested
Delegated to: Pablo Neira
Headers show
Series treewide: use uint* instead of u_int* | expand

Commit Message

Nick May 16, 2022, 6:47 a.m. UTC 
From: Nick Hainke <vincent@systemli.org>

Gcc complains about missing types. Two commits introduced u_int* instead
of uint*. Use uint treewide.

Fixes errors in the form of:
In file included from xtables-legacy-multi.c:5:
xshared.h:83:56: error: unknown type name 'u_int16_t'; did you mean 'uint16_t'?
    83 | set_option(unsigned int *options, unsigned int option, u_int16_t *invflg,
        |                                                        ^~~~~~~~~
        |                                                        uint16_t
make[6]: *** [Makefile:712: xtables_legacy_multi-xtables-legacy-multi.o] Error 1

Fixes: c8f28cc8b841 ("extensions: libxt_conntrack: add support for
                      specifying port ranges")
Fixes: f647f61f273a ("xtables: Make invflags 16bit wide")

Signed-off-by: Nick Hainke <vincent@systemli.org>
---
 extensions/libxt_conntrack.c | 2 +-
 iptables/xshared.c           | 2 +-
 iptables/xshared.h           | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

Comments

Jan Engelhardt May 16, 2022, 10:28 a.m. UTC | #1 
On Monday 2022-05-16 08:47, vincent@systemli.org wrote:

>From: Nick Hainke <vincent@systemli.org>
>
>Gcc complains about missing types. Two commits introduced u_int* instead
>of uint*. Use uint treewide.

I approve of this.

There are, however, a few more instances of u_int* in the source tree, they
could be fixed up in the same go.
> extensions/libxt_conntrack.c | 2 +-
> iptables/xshared.c           | 2 +-
> iptables/xshared.h           | 2 +-
> 3 files changed, 3 insertions(+), 3 deletions(-)
diff mbox series

Patch

diff --git a/extensions/libxt_conntrack.c b/extensions/libxt_conntrack.c
index 64018ce1..234085c5 100644
--- a/extensions/libxt_conntrack.c
+++ b/extensions/libxt_conntrack.c
@@ -778,7 +778,7 @@  matchinfo_print(const void *ip, const struct xt_entry_match *match, int numeric,
 
 static void
 conntrack_dump_ports(const char *prefix, const char *opt,
-		     u_int16_t port_low, u_int16_t port_high)
+		     uint16_t port_low, uint16_t port_high)
 {
 	if (port_high == 0 || port_low == port_high)
 		printf(" %s%s %u", prefix, opt, port_low);
diff --git a/iptables/xshared.c b/iptables/xshared.c
index a8512d38..9b5e5b5b 100644
--- a/iptables/xshared.c
+++ b/iptables/xshared.c
@@ -1025,7 +1025,7 @@  static const int inverse_for_options[NUMBER_OF_OPT] =
 };
 
 void
-set_option(unsigned int *options, unsigned int option, u_int16_t *invflg,
+set_option(unsigned int *options, unsigned int option, uint16_t *invflg,
 	   bool invert)
 {
 	if (*options & option)
diff --git a/iptables/xshared.h b/iptables/xshared.h
index 14568bb0..f8212988 100644
--- a/iptables/xshared.h
+++ b/iptables/xshared.h
@@ -80,7 +80,7 @@  struct xtables_target;
 #define IPT_INV_ARPHRD		0x0800
 
 void
-set_option(unsigned int *options, unsigned int option, u_int16_t *invflg,
+set_option(unsigned int *options, unsigned int option, uint16_t *invflg,
 	   bool invert);
 
 /**