Jan Engelhardt: remove unneedd macro

diff --git a/extensions/ebt_802_3.c b/extensions/ebt_802_3.c
index a43d060..dd22eb2 100644 (file)
--- a/extensions/ebt_802_3.c
+++ b/extensions/ebt_802_3.c
@@ -130,7 +130,7 @@ static int compare(const struct ebt_entry_match *m1,
 
 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,

diff --git a/extensions/ebt_among.c b/extensions/ebt_among.c
index edd678e..85bf0b5 100644 (file)
--- a/extensions/ebt_among.c
+++ b/extensions/ebt_among.c
@@ -476,7 +476,7 @@ static int compare(const struct ebt_entry_match *m1,
 }
 
 static struct ebt_u_match among_match = {
-       .name           = EBT_AMONG_MATCH,
+       .name           = "among",
        .size           = sizeof(struct ebt_among_info),
        .help           = print_help,
        .init           = init,

diff --git a/extensions/ebt_arp.c b/extensions/ebt_arp.c
index 4171d57..64d337d 100644 (file)
--- a/extensions/ebt_arp.c
+++ b/extensions/ebt_arp.c
@@ -351,7 +351,7 @@ static int compare(const struct ebt_entry_match *m1,
 
 static struct ebt_u_match arp_match =
 {
-       .name           = EBT_ARP_MATCH,
+       .name           = "arp",
        .size           = sizeof(struct ebt_arp_info),
        .help           = print_help,
        .init           = init,

diff --git a/extensions/ebt_arpreply.c b/extensions/ebt_arpreply.c
index 32e50b4..0b81b1c 100644 (file)
--- a/extensions/ebt_arpreply.c
+++ b/extensions/ebt_arpreply.c
@@ -122,7 +122,7 @@ static int compare(const struct ebt_entry_target *t1,
 
 static struct ebt_u_target arpreply_target =
 {
-       .name           = EBT_ARPREPLY_TARGET,
+       .name           = "arpreply",
        .size           = sizeof(struct ebt_arpreply_info),
        .help           = print_help,
        .init           = init,

diff --git a/extensions/ebt_ip.c b/extensions/ebt_ip.c
index 4fac896..4e0b7f0 100644 (file)
--- a/extensions/ebt_ip.c
+++ b/extensions/ebt_ip.c
@@ -327,7 +327,7 @@ static int compare(const struct ebt_entry_match *m1,
 
 static struct ebt_u_match ip_match =
 {
-       .name           = EBT_IP_MATCH,
+       .name           = "ip",
        .size           = sizeof(struct ebt_ip_info),
        .help           = print_help,
        .init           = init,

diff --git a/extensions/ebt_limit.c b/extensions/ebt_limit.c
index 5655b59..5349baa 100644 (file)
--- a/extensions/ebt_limit.c
+++ b/extensions/ebt_limit.c
@@ -201,7 +201,7 @@ static int compare(const struct ebt_entry_match* m1,
 
 static struct ebt_u_match limit_match =
 {
-       .name           = EBT_LIMIT_MATCH,
+       .name           = "limit",
        .size           = sizeof(struct ebt_limit_info),
        .help           = print_help,
        .init           = init,

diff --git a/extensions/ebt_log.c b/extensions/ebt_log.c
index 575d12e..c728304 100644 (file)
--- a/extensions/ebt_log.c
+++ b/extensions/ebt_log.c
@@ -193,7 +193,7 @@ static int compare(const struct ebt_entry_watcher *w1,
 
 static struct ebt_u_watcher log_watcher =
 {
-       .name           = EBT_LOG_WATCHER,
+       .name           = "log",
        .size           = sizeof(struct ebt_log_info),
        .help           = print_help,
        .init           = init,

diff --git a/extensions/ebt_mark.c b/extensions/ebt_mark.c
index a924ceb..5776b1c 100644 (file)
--- a/extensions/ebt_mark.c
+++ b/extensions/ebt_mark.c
@@ -161,7 +161,7 @@ static int compare(const struct ebt_entry_target *t1,
 
 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,

diff --git a/extensions/ebt_mark_m.c b/extensions/ebt_mark_m.c
index 8c5913e..2a259b0 100644 (file)
--- a/extensions/ebt_mark_m.c
+++ b/extensions/ebt_mark_m.c
@@ -110,7 +110,7 @@ static int compare(const struct ebt_entry_match *m1,
 
 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,

diff --git a/extensions/ebt_nat.c b/extensions/ebt_nat.c
index a2941fc..8c4dab8 100644 (file)
--- a/extensions/ebt_nat.c
+++ b/extensions/ebt_nat.c
@@ -207,7 +207,7 @@ static int compare(const struct ebt_entry_target *t1,
 
 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,

diff --git a/extensions/ebt_pkttype.c b/extensions/ebt_pkttype.c
index 3333a9b..5b5cb03 100644 (file)
--- a/extensions/ebt_pkttype.c
+++ b/extensions/ebt_pkttype.c
@@ -114,7 +114,7 @@ static int compare(const struct ebt_entry_match *m1,
 
 static struct ebt_u_match pkttype_match =
 {
-       .name           = EBT_PKTTYPE_MATCH,
+       .name           = "pkttype",
        .size           = sizeof(struct ebt_pkttype_info),
        .help           = print_help,
        .init           = init,

diff --git a/extensions/ebt_redirect.c b/extensions/ebt_redirect.c
index 8630254..e470818 100644 (file)
--- a/extensions/ebt_redirect.c
+++ b/extensions/ebt_redirect.c
@@ -97,7 +97,7 @@ static int compare(const struct ebt_entry_target *t1,
 
 static struct ebt_u_target redirect_target =
 {
-       .name           = EBT_REDIRECT_TARGET,
+       .name           = "redirect",
        .size           = sizeof(struct ebt_redirect_info),
        .help           = print_help,
        .init           = init,

diff --git a/extensions/ebt_standard.c b/extensions/ebt_standard.c
index 8059f66..67d4d7c 100644 (file)
--- a/extensions/ebt_standard.c
+++ b/extensions/ebt_standard.c
@@ -72,7 +72,7 @@ static int compare(const struct ebt_entry_target *t1,
 
 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,

diff --git a/extensions/ebt_stp.c b/extensions/ebt_stp.c
index 08a48fb..2b108a7 100644 (file)
--- a/extensions/ebt_stp.c
+++ b/extensions/ebt_stp.c
@@ -326,7 +326,7 @@ static int compare(const struct ebt_entry_match *m1,
 
 static struct ebt_u_match stp_match =
 {
-       .name           = EBT_STP_MATCH,
+       .name           = "stp",
        .size           = sizeof(struct ebt_stp_info),
        .help           = print_help,
        .init           = init,

diff --git a/extensions/ebt_ulog.c b/extensions/ebt_ulog.c
index 673b4b4..162586d 100644 (file)
--- a/extensions/ebt_ulog.c
+++ b/extensions/ebt_ulog.c
@@ -169,7 +169,7 @@ static int compare(const struct ebt_entry_watcher *w1,
 
 static struct ebt_u_watcher ulog_watcher =
 {
-       .name           = EBT_ULOG_WATCHER,
+       .name           = "ulog",
        .size           = sizeof(struct ebt_ulog_info),
        .help           = print_help,
        .init           = init,

diff --git a/extensions/ebt_vlan.c b/extensions/ebt_vlan.c
index 21f2e22..6714c82 100644 (file)
--- a/extensions/ebt_vlan.c
+++ b/extensions/ebt_vlan.c
@@ -170,7 +170,7 @@ static int compare(const struct ebt_entry_match *vlan1,
 }
 
 static struct ebt_u_match vlan_match = {
-       .name           = EBT_VLAN_MATCH,
+       .name           = "vlan",
        .size           = sizeof(struct ebt_vlan_info),
        .help           = print_help,
        .init           = init,