commit a41545ca7cde43e0ba53260ba74bd9bf74025a68
author Jan Engelhardt <jengelh@medozas.de> Tue Jan 27 21:27:19 2009 +0100
committer Jan Engelhardt <jengelh@medozas.de> Fri Jan 30 03:27:53 2009 +0100
tree d86a76f400285eb02afedca698c59c64bc273d77
parent dacafa55379fd98212031d8c559096c91d7ce93b

libxtables: prefix/order - param_act

Changes:
	exittype -> xtables_exittype
	P_* -> XTF_* flags

Signed-off-by: Jan Engelhardt <jengelh@medozas.de>

extensions/libxt_conntrack.c

diff --git a/extensions/libxt_conntrack.c b/extensions/libxt_conntrack.c
index 2b98ab0..facd0fc 100644
--- a/extensions/libxt_conntrack.c
+++ b/extensions/libxt_conntrack.c
@@ -269,13 +269,13 @@
 	char *end;
 
 	if (!xtables_strtoui(s, &end, &min, 0, UINT32_MAX))
-		param_act(P_BAD_VALUE, "conntrack", "--expires", s);
+		xtables_param_act(XTF_BAD_VALUE, "conntrack", "--expires", s);
 	max = min;
 	if (*end == ':')
 		if (!xtables_strtoui(s, &end, &max, 0, UINT32_MAX))
-			param_act(P_BAD_VALUE, "conntrack", "--expires", s);
+			xtables_param_act(XTF_BAD_VALUE, "conntrack", "--expires", s);
 	if (*end != '\0')
-		param_act(P_BAD_VALUE, "conntrack", "--expires", s);
+		xtables_param_act(XTF_BAD_VALUE, "conntrack", "--expires", s);
 
 	if (min > max)
 		exit_error(PARAMETER_PROBLEM,
@@ -482,7 +482,7 @@
 
 	case 'a': /* --ctorigsrcport */
 		if (!xtables_strtoui(optarg, NULL, &port, 0, UINT16_MAX))
-			param_act(P_BAD_VALUE, "conntrack",
+			xtables_param_act(XTF_BAD_VALUE, "conntrack",
 			          "--ctorigsrcport", optarg);
 		info->match_flags |= XT_CONNTRACK_ORIGSRC_PORT;
 		info->origsrc_port = htons(port);
@@ -492,7 +492,7 @@
 
 	case 'b': /* --ctorigdstport */
 		if (!xtables_strtoui(optarg, NULL, &port, 0, UINT16_MAX))
-			param_act(P_BAD_VALUE, "conntrack",
+			xtables_param_act(XTF_BAD_VALUE, "conntrack",
 			          "--ctorigdstport", optarg);
 		info->match_flags |= XT_CONNTRACK_ORIGDST_PORT;
 		info->origdst_port = htons(port);
@@ -502,7 +502,7 @@
 
 	case 'c': /* --ctreplsrcport */
 		if (!xtables_strtoui(optarg, NULL, &port, 0, UINT16_MAX))
-			param_act(P_BAD_VALUE, "conntrack",
+			xtables_param_act(XTF_BAD_VALUE, "conntrack",
 			          "--ctreplsrcport", optarg);
 		info->match_flags |= XT_CONNTRACK_REPLSRC_PORT;
 		info->replsrc_port = htons(port);
@@ -512,7 +512,7 @@
 
 	case 'd': /* --ctrepldstport */
 		if (!xtables_strtoui(optarg, NULL, &port, 0, UINT16_MAX))
-			param_act(P_BAD_VALUE, "conntrack",
+			xtables_param_act(XTF_BAD_VALUE, "conntrack",
 			          "--ctrepldstport", optarg);
 		info->match_flags |= XT_CONNTRACK_REPLDST_PORT;
 		info->repldst_port = htons(port);
@@ -521,7 +521,7 @@
 		break;
 
 	case 'e': /* --ctdir */
-		param_act(P_NO_INVERT, "conntrack", "--ctdir", invert);
+		xtables_param_act(XTF_NO_INVERT, "conntrack", "--ctdir", invert);
 		if (strcasecmp(optarg, "ORIGINAL") == 0) {
 			info->match_flags  |= XT_CONNTRACK_DIRECTION;
 			info->invert_flags &= ~XT_CONNTRACK_DIRECTION;
@@ -529,7 +529,7 @@
 			info->match_flags  |= XT_CONNTRACK_DIRECTION;
 			info->invert_flags |= XT_CONNTRACK_DIRECTION;
 		} else {
-			param_act(P_BAD_VALUE, "conntrack", "--ctdir", optarg);
+			xtables_param_act(XTF_BAD_VALUE, "conntrack", "--ctdir", optarg);
 		}
 		break;