From 907b435ac8559c4e353dbdd4fb969c465973d142 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ermal=20Lu=E7i?= <eri@pfsense.org>
Date: Fri, 5 Mar 2010 15:40:21 +0000
Subject: Catch up with php changes.

---
 etc/inc/shaper.inc | 24 ++++++++++++------------
 1 file changed, 12 insertions(+), 12 deletions(-)

(limited to 'etc')

diff --git a/etc/inc/shaper.inc b/etc/inc/shaper.inc
index a9475e9..94f57f3 100644
--- a/etc/inc/shaper.inc
+++ b/etc/inc/shaper.inc
@@ -393,16 +393,16 @@ class altq_root_queue {
 
 		switch ($this->GetScheduler()) {
 		case "PRIQ":
-			$q =& new priq_queue();
+			$q = new priq_queue();
 			break;
 		case "HFSC":
-			$q =& new hfsc_queue();
+			$q = new hfsc_queue();
 			break;
 		case "CBQ":
-			$q =& new cbq_queue();
+			$q = new cbq_queue();
 			break;
 		case "FAIRQ":
-			$q =& new fairq_queue();
+			$q = new fairq_queue();
 			break;
 		default:
 			/* XXX: but should not happen anyway */ 
@@ -922,7 +922,7 @@ class priq_queue {
 			return $this; 
 	}
 	
-	function find_parentqueue($interface, $qname) { return; }
+	function &find_parentqueue($interface, $qname) { return; }
 		
 	function validate_input($data, &$input_errors) {
 	
@@ -1312,7 +1312,7 @@ class hfsc_queue extends priq_queue {
 
 		if (!is_array($this->subqueues))
 			$this->subqueues = array();
-		$q =& new hfsc_queue();
+		$q = new hfsc_queue();
 		$q->SetInterface($this->GetInterface());
 		$q->SetParent(&$this);
 		$q->ReadConfig($qname);
@@ -2003,7 +2003,7 @@ class cbq_queue extends priq_queue {
 
 		if (!is_array($this->subqueues))
 			$this->subqueues = array();
-		$q =& new cbq_queue();
+		$q = new cbq_queue();
 		$q->SetInterface($this->GetInterface());
 		$q->SetParent(&$this);
 		$q->ReadConfig($qname);
@@ -2377,7 +2377,7 @@ class fairq_queue extends priq_queue {
 			return $this;
 	}
 
-	function find_parentqueue($interface, $qname) { return; }
+	function &find_parentqueue($interface, $qname) { return; }
 
 	function delete_queue() {
 		unref_on_altq_queue_list($this->GetQname());
@@ -2771,7 +2771,7 @@ class dnpipe_class extends dummynet_class {
 		if (!is_array($this->subqueues))
 			$this->subqueues = array();
 			
-		$q =& new dnqueue_class();
+		$q = new dnqueue_class();
 		$q->SetLink($path);
 		$q->SetEnabled("on");
 		$q->SetPipe($this->GetQname());
@@ -3561,7 +3561,7 @@ function read_layer7_config() {
     foreach ($l7cs as $conf) {
 	if (empty($conf['name']))
 		continue; /* XXX: grrrrrr at php */ 
-        $root =& new layer7();
+        $root = new layer7();
         $root->ReadConfig($conf['name'],$conf);
         $layer7_rules_list[$root->GetRName()] = &$root;
     }
@@ -3786,7 +3786,7 @@ function read_altq_config() {
 
 	foreach ($a_int as $key => $conf) {
 				$int = $conf['interface'];
-				$root =& new altq_root_queue();
+				$root = new altq_root_queue();
 				$root->SetInterface($int);
 				$altq_list_queues[$root->GetInterface()] = &$root;
 				$root->ReadConfig($conf);
@@ -3828,7 +3828,7 @@ function read_dummynet_config() {
 	foreach ($a_int as $key => $conf) {
 		if (empty($conf['name']))
 			continue; /* XXX: grrrrrr at php */ 
-		$root =& new dnpipe_class();
+		$root = new dnpipe_class();
 		$root->ReadConfig($conf);
 		$root->SetNumber($dnpipenumber);	
 		$dummynet_pipe_list[$root->GetQname()] = &$root;
-- 
cgit v1.1