From 4aa630e0b70a0b510850e01e6d029eaff0c68344 Mon Sep 17 00:00:00 2001
From: Max Kellermann <max@foo-projects.org>
Date: Tue, 26 Feb 2008 07:38:58 +0000
Subject: [PATCH] eliminated rule_defined()

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

diff --git a/src/ferm b/src/ferm
index ad77617..374e23e 100755
--- a/src/ferm
+++ b/src/ferm
@@ -1604,14 +1604,6 @@ sub merge_keywords(\%$$$) {
     }
 }
 
-sub rule_defined(\%) {
-    my $rule = shift;
-    return defined($rule->{domain}) or
-      keys(%{$rule->{builtin}}) > 0 or
-      keys(%{$rule->{match}}) > 0 or
-      keys(%{$rule->{action}}) > 0;
-}
-
 sub set_domain(\%$) {
     my ($rule, $domain) = @_;
 
@@ -1739,7 +1731,7 @@ sub enter($$) {
             # hooks for custom shell commands
             if ($keyword eq 'hook') {
                 error('"hook" must be the first token in a command')
-                  if rule_defined(%current);
+                  if exists $current{domain};
 
                 my $position = getvar();
                 my $hooks;
-- 
2.11.4.GIT