[PATCH] expand/remove unneeded macros
Jan Engelhardt <[email protected]> Wed, 30 Jan 2008 19:30:38 +0100 (CET)
| Newsgroups | gmane.linux.network.bridge.ebtables.devel |
|---|---|
| Message-ID | <[email protected]> |
According to http://marc.info/?l=netfilter-devel&m=120083920425755&w=2
I need to expand these, so let's do that.
---
extensions/ebt_802_3.c | 2 +-
extensions/ebt_among.c | 2 +-
extensions/ebt_arp.c | 2 +-
extensions/ebt_arpreply.c | 2 +-
extensions/ebt_ip.c | 2 +-
extensions/ebt_limit.c | 2 +-
extensions/ebt_log.c | 2 +-
extensions/ebt_mark.c | 2 +-
extensions/ebt_mark_m.c | 2 +-
extensions/ebt_nat.c | 4 ++--
extensions/ebt_pkttype.c | 2 +-
extensions/ebt_redirect.c | 2 +-
extensions/ebt_standard.c | 2 +-
extensions/ebt_stp.c | 2 +-
extensions/ebt_ulog.c | 2 +-
extensions/ebt_vlan.c | 2 +-
16 files changed, 17 insertions(+), 17 deletions(-)
Index: ebtables-v2.0.8-2/extensions/ebt_802_3.c
===================================================================
--- ebtables-v2.0.8-2.orig/extensions/ebt_802_3.c
+++ ebtables-v2.0.8-2/extensions/ebt_802_3.c
@@ -130,7 +130,7 @@ static int compare(const struct ebt_entr
static struct ebt_u_match _802_3_match =
{
- .name = EBT_802_3_MATCH,
+ .name = "802_3",
.size = sizeof(struct ebt_802_3_info),
.help = print_help,
.init = init,
Index: ebtables-v2.0.8-2/extensions/ebt_among.c
===================================================================
--- ebtables-v2.0.8-2.orig/extensions/ebt_among.c
+++ ebtables-v2.0.8-2/extensions/ebt_among.c
@@ -476,7 +476,7 @@ static int compare(const struct ebt_entr
}
static struct ebt_u_match among_match = {
- .name = EBT_AMONG_MATCH,
+ .name = "among",
.size = sizeof(struct ebt_among_info),
.help = print_help,
.init = init,
Index: ebtables-v2.0.8-2/extensions/ebt_arp.c
===================================================================
--- ebtables-v2.0.8-2.orig/extensions/ebt_arp.c
+++ ebtables-v2.0.8-2/extensions/ebt_arp.c
@@ -351,7 +351,7 @@ static int compare(const struct ebt_entr
static struct ebt_u_match arp_match =
{
- .name = EBT_ARP_MATCH,
+ .name = "arp",
.size = sizeof(struct ebt_arp_info),
.help = print_help,
.init = init,
Index: ebtables-v2.0.8-2/extensions/ebt_arpreply.c
===================================================================
--- ebtables-v2.0.8-2.orig/extensions/ebt_arpreply.c
+++ ebtables-v2.0.8-2/extensions/ebt_arpreply.c
@@ -122,7 +122,7 @@ static int compare(const struct ebt_entr
static struct ebt_u_target arpreply_target =
{
- .name = EBT_ARPREPLY_TARGET,
+ .name = "arpreply",
.size = sizeof(struct ebt_arpreply_info),
.help = print_help,
.init = init,
Index: ebtables-v2.0.8-2/extensions/ebt_ip.c
===================================================================
--- ebtables-v2.0.8-2.orig/extensions/ebt_ip.c
+++ ebtables-v2.0.8-2/extensions/ebt_ip.c
@@ -327,7 +327,7 @@ static int compare(const struct ebt_entr
static struct ebt_u_match ip_match =
{
- .name = EBT_IP_MATCH,
+ .name = "ip",
.size = sizeof(struct ebt_ip_info),
.help = print_help,
.init = init,
Index: ebtables-v2.0.8-2/extensions/ebt_limit.c
===================================================================
--- ebtables-v2.0.8-2.orig/extensions/ebt_limit.c
+++ ebtables-v2.0.8-2/extensions/ebt_limit.c
@@ -201,7 +201,7 @@ static int compare(const struct ebt_entr
static struct ebt_u_match limit_match =
{
- .name = EBT_LIMIT_MATCH,
+ .name = "limit",
.size = sizeof(struct ebt_limit_info),
.help = print_help,
.init = init,
Index: ebtables-v2.0.8-2/extensions/ebt_log.c
===================================================================
--- ebtables-v2.0.8-2.orig/extensions/ebt_log.c
+++ ebtables-v2.0.8-2/extensions/ebt_log.c
@@ -193,7 +193,7 @@ static int compare(const struct ebt_entr
static struct ebt_u_watcher log_watcher =
{
- .name = EBT_LOG_WATCHER,
+ .name = "log",
.size = sizeof(struct ebt_log_info),
.help = print_help,
.init = init,
Index: ebtables-v2.0.8-2/extensions/ebt_mark.c
===================================================================
--- ebtables-v2.0.8-2.orig/extensions/ebt_mark.c
+++ ebtables-v2.0.8-2/extensions/ebt_mark.c
@@ -161,7 +161,7 @@ static int compare(const struct ebt_entr
static struct ebt_u_target mark_target =
{
- .name = EBT_MARK_TARGET,
+ .name = "mark",
.size = sizeof(struct ebt_mark_t_info),
.help = print_help,
.init = init,
Index: ebtables-v2.0.8-2/extensions/ebt_mark_m.c
===================================================================
--- ebtables-v2.0.8-2.orig/extensions/ebt_mark_m.c
+++ ebtables-v2.0.8-2/extensions/ebt_mark_m.c
@@ -110,7 +110,7 @@ static int compare(const struct ebt_entr
static struct ebt_u_match mark_match =
{
- .name = EBT_MARK_MATCH,
+ .name = "mark_m",
.size = sizeof(struct ebt_mark_m_info),
.help = print_help,
.init = init,
Index: ebtables-v2.0.8-2/extensions/ebt_nat.c
===================================================================
--- ebtables-v2.0.8-2.orig/extensions/ebt_nat.c
+++ ebtables-v2.0.8-2/extensions/ebt_nat.c
@@ -207,7 +207,7 @@ static int compare(const struct ebt_entr
static struct ebt_u_target snat_target =
{
- .name = EBT_SNAT_TARGET,
+ .name = "snat",
.size = sizeof(struct ebt_nat_info),
.help = print_help_s,
.init = init_s,
@@ -220,7 +220,7 @@ static struct ebt_u_target snat_target =
static struct ebt_u_target dnat_target =
{
- .name = EBT_DNAT_TARGET,
+ .name = "dnat",
.size = sizeof(struct ebt_nat_info),
.help = print_help_d,
.init = init_d,
Index: ebtables-v2.0.8-2/extensions/ebt_pkttype.c
===================================================================
--- ebtables-v2.0.8-2.orig/extensions/ebt_pkttype.c
+++ ebtables-v2.0.8-2/extensions/ebt_pkttype.c
@@ -114,7 +114,7 @@ static int compare(const struct ebt_entr
static struct ebt_u_match pkttype_match =
{
- .name = EBT_PKTTYPE_MATCH,
+ .name = "pkttype",
.size = sizeof(struct ebt_pkttype_info),
.help = print_help,
.init = init,
Index: ebtables-v2.0.8-2/extensions/ebt_redirect.c
===================================================================
--- ebtables-v2.0.8-2.orig/extensions/ebt_redirect.c
+++ ebtables-v2.0.8-2/extensions/ebt_redirect.c
@@ -97,7 +97,7 @@ static int compare(const struct ebt_entr
static struct ebt_u_target redirect_target =
{
- .name = EBT_REDIRECT_TARGET,
+ .name = "redirect",
.size = sizeof(struct ebt_redirect_info),
.help = print_help,
.init = init,
Index: ebtables-v2.0.8-2/extensions/ebt_standard.c
===================================================================
--- ebtables-v2.0.8-2.orig/extensions/ebt_standard.c
+++ ebtables-v2.0.8-2/extensions/ebt_standard.c
@@ -72,7 +72,7 @@ static int compare(const struct ebt_entr
static struct ebt_u_target standard =
{
- .name = EBT_STANDARD_TARGET,
+ .name = "standard",
.size = sizeof(struct ebt_standard_target) -
sizeof(struct ebt_entry_target),
.help = print_help,
Index: ebtables-v2.0.8-2/extensions/ebt_stp.c
===================================================================
--- ebtables-v2.0.8-2.orig/extensions/ebt_stp.c
+++ ebtables-v2.0.8-2/extensions/ebt_stp.c
@@ -326,7 +326,7 @@ static int compare(const struct ebt_entr
static struct ebt_u_match stp_match =
{
- .name = EBT_STP_MATCH,
+ .name = "stp",
.size = sizeof(struct ebt_stp_info),
.help = print_help,
.init = init,
Index: ebtables-v2.0.8-2/extensions/ebt_ulog.c
===================================================================
--- ebtables-v2.0.8-2.orig/extensions/ebt_ulog.c
+++ ebtables-v2.0.8-2/extensions/ebt_ulog.c
@@ -169,7 +169,7 @@ static int compare(const struct ebt_entr
static struct ebt_u_watcher ulog_watcher =
{
- .name = EBT_ULOG_WATCHER,
+ .name = "ulog",
.size = sizeof(struct ebt_ulog_info),
.help = print_help,
.init = init,
Index: ebtables-v2.0.8-2/extensions/ebt_vlan.c
===================================================================
--- ebtables-v2.0.8-2.orig/extensions/ebt_vlan.c
+++ ebtables-v2.0.8-2/extensions/ebt_vlan.c
@@ -170,7 +170,7 @@ static int compare(const struct ebt_entr
}
static struct ebt_u_match vlan_match = {
- .name = EBT_VLAN_MATCH,
+ .name = "vlan",
.size = sizeof(struct ebt_vlan_info),
.help = print_help,
.init = init,
-------------------------------------------------------------------------
This SF.net email is sponsored by: Microsoft
Defy all challenges. Microsoft(R) Visual Studio 2008.
http://clk.atdmt.com/MRT/go/vse0120000070mrt/direct/01/