From 7c38508172011496e2037f8a546a7a68a7207ceb Mon Sep 17 00:00:00 2001
From: Max Kellermann <max@foo-projects.org>
Date: Sun, 16 Dec 2007 12:23:45 +0000
Subject: [PATCH] dont pass module name to parse_option()

git-svn-id: svn+ssh://foo-projects.org/var/svn/ferm/trunk@1025 887c3e53-ddf1-0310-8e39-e0d3fab4ed34
---
 src/ferm | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/ferm b/src/ferm
index e45a61b..f07ffdc 100755
--- a/src/ferm
+++ b/src/ferm
@@ -1438,7 +1438,7 @@ sub parse_builtin_matches($$$) {
     my $domain_family = $current->{domain_family};
 
     if (exists $match_defs{$domain_family}) {
-        parse_option('', $match_defs{$domain_family}{''},
+        parse_option($match_defs{$domain_family}{''},
                      $current, $current->{builtin},
                      $keyword, $negated_ref)
           and return 1;
@@ -1526,8 +1526,8 @@ sub parse_keyword($$$$) {
 }
 
 # parse options of a module
-sub parse_option($$$$$$) {
-    my ($name, $def, $current, $store, $keyword, $negated_ref) = @_;
+sub parse_option($$$$$) {
+    my ($def, $current, $store, $keyword, $negated_ref) = @_;
 
     my $k = $def->{keywords}{$keyword};
     return unless defined $k;
@@ -1565,7 +1565,7 @@ sub parse_protocol_options($$$$) {
                  };
     push @{$current->{match}}, $module;
 
-    return parse_option($proto, $proto_def,
+    return parse_option($proto_def,
                         $current, $module->{options},
                         $keyword, $negated_ref);
 }
@@ -2105,7 +2105,7 @@ sub enter($$) {
                     die;
                 }
 
-                parse_option($module, $defs, \%current, $store, $keyword, \$negated);
+                parse_option($defs, \%current, $store, $keyword, \$negated);
                 next;
             }
 
-- 
2.11.4.GIT