* Eliminate dead code

* Fix warnings and errors found by eclipse

3 files changed, 5 insertions, 28 deletions

diff --git a/etc/inc/auth.inc b/etc/inc/auth.inc
index b9d1d6b..0306a53 100644
--- a/etc/inc/auth.inc
+++ b/etc/inc/auth.inc
@@ -65,7 +65,8 @@ function passwd_backed_basic_auth() {
 			continue;
 
 		/* Get crypted password */
-                preg_match("/^$username:((\\$1\\$[.\d\w_\/]{8}\\$)[.\d\w_\/]{22})$/", $line, $matches);
+		$matches = "";
+        preg_match("/^$username:((\\$1\\$[.\d\w_\/]{8}\\$)[.\d\w_\/]{22})$/", $line, $matches);
 		$pass = $matches[1];
 		$salt = $matches[2];
 
@@ -108,6 +109,7 @@ function htpasswd_backed_basic_auth() {
                         continue;
 
                 /* Get crypted password */
+                $matches = "";
                 preg_match("/^$username:((\\$1\\$[.\d\w_\/]{8}\\$)[.\d\w_\/]{22})$/", $line, $matches);
                 $pass = $matches[1];
                 $salt = $matches[2];
diff --git a/etc/inc/captiveportal.inc b/etc/inc/captiveportal.inc
index 002da98..bef9fba 100644
--- a/etc/inc/captiveportal.inc
+++ b/etc/inc/captiveportal.inc
@@ -717,6 +717,7 @@ function captiveportal_allowedip_configure() {
 /* get last activity timestamp given ipfw rule number */
 function captiveportal_get_last_activity($ruleno) {
 	
+	$ipfwoutput = "";
 	exec("/sbin/ipfw -T list {$ruleno} 2>/dev/null", $ipfwoutput);
 	
 	/* in */
diff --git a/etc/inc/filter.inc b/etc/inc/filter.inc
index aed35b4..7d09e41 100644
--- a/etc/inc/filter.inc
+++ b/etc/inc/filter.inc
@@ -218,32 +218,6 @@ function filter_configure_sync() {
 	return 0;
 }
 
-function filter_get_rule_interface($associatedrulenumber) {
-	global $config;
-	if(isset($config['system']['developerspew'])) {
-		$mt = microtime();
-		echo "filter_get_rule_interface() being called $mt\n";
-	}	
-	foreach ($config['shaper']['rule'] as $rule) {
-		if($rule['descr'] == $associatedrule) return $rule['interface'];
-	}
-	return $config['shaper']['rule'][$associatedrulenumber]['interface'];
-}
-
-function filter_get_rule_real_interface($associatedrulenumber) {
-        global $config;
-	if(isset($config['system']['developerspew'])) {
-		$mt = microtime();
-		echo "filter_get_rule_real_interface() being called $mt\n";
-	}	
-        $x=0;
-        foreach($config['shaper']['rule'] as $rule) {
-                if($x == $associatedrulenumber)
-                        return $rule['interface'];
-                $x++;
-        }
-}
-
 function filter_generate_aliases() {
 	global $config;
 	if(isset($config['system']['developerspew'])) {
@@ -401,7 +375,7 @@ function filter_nat_rules_generate_if($if, $src = "any", $srcport = "", $dst = "
 }
 
 function is_one_to_one_or_server_nat_rule($iptocheck) {
-	global $config;
+	global $config, $target;
 	if(isset($config['system']['developerspew'])) {
 		$mt = microtime();
 		echo "is_one_to_one_or_server_nat_rule() being called $mt\n";