From: Felix Janda <felix.janda@posteo.de>
To: netfilter-devel@vger.kernel.org
Subject: [PATCH iptables 2/4] xtables.h: Use <stdint.h> types
Date: Tue, 16 Jun 2015 21:23:52 +0200 [thread overview]
Message-ID: <20150616192352.GD3247@euler> (raw)
Signed-off-by: Felix Janda <felix.janda@posteo.de>
---
include/xtables.h | 20 ++++++++++----------
1 file changed, 10 insertions(+), 10 deletions(-)
diff --git a/include/xtables.h b/include/xtables.h
index bad11a8..978ae0d 100644
--- a/include/xtables.h
+++ b/include/xtables.h
@@ -220,12 +220,12 @@ struct xtables_match
const char *real_name;
/* Revision of match (0 by default). */
- u_int8_t revision;
+ uint8_t revision;
/* Extension flags */
- u_int8_t ext_flags;
+ uint8_t ext_flags;
- u_int16_t family;
+ uint16_t family;
/* Size of match data. */
size_t size;
@@ -297,12 +297,12 @@ struct xtables_target
const char *real_name;
/* Revision of target (0 by default). */
- u_int8_t revision;
+ uint8_t revision;
/* Extension flags */
- u_int8_t ext_flags;
+ uint8_t ext_flags;
- u_int16_t family;
+ uint16_t family;
/* Size of target data. */
@@ -373,7 +373,7 @@ struct xtables_rule_match {
*/
struct xtables_pprot {
const char *name;
- u_int8_t num;
+ uint8_t num;
};
enum xtables_tryload {
@@ -449,12 +449,12 @@ extern bool xtables_strtoul(const char *, char **, uintmax_t *,
extern bool xtables_strtoui(const char *, char **, unsigned int *,
unsigned int, unsigned int);
extern int xtables_service_to_port(const char *name, const char *proto);
-extern u_int16_t xtables_parse_port(const char *port, const char *proto);
+extern uint16_t xtables_parse_port(const char *port, const char *proto);
extern void
xtables_parse_interface(const char *arg, char *vianame, unsigned char *mask);
/* this is a special 64bit data type that is 8-byte aligned */
-#define aligned_u64 u_int64_t __attribute__((aligned(8)))
+#define aligned_u64 uint64_t __attribute__((aligned(8)))
extern struct xtables_globals *xt_params;
#define xtables_error (xt_params->exit_err)
@@ -517,7 +517,7 @@ extern void xtables_print_num(uint64_t number, unsigned int format);
#endif
extern const struct xtables_pprot xtables_chain_protos[];
-extern u_int16_t xtables_parse_protocol(const char *s);
+extern uint16_t xtables_parse_protocol(const char *s);
/* kernel revision handling */
extern int kernel_version;
--
2.3.6
reply other threads:[~2015-06-16 19:24 UTC|newest]
Thread overview: [no followups] expand[flat|nested] mbox.gz Atom feed
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20150616192352.GD3247@euler \
--to=felix.janda@posteo.de \
--cc=netfilter-devel@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).