From 597c982e513c9fef84e64e9aaef77cb736245096 Mon Sep 17 00:00:00 2001
From: Josh Stone <jistone@redhat.com>
Date: Thu, 17 Sep 2009 14:42:04 -0700
Subject: Remove temporaries in netdev.change_mac

As reported by dsmith, reusing temporary locals will prevent our
limited optimizer from eliminating code.  I'm getting rid of these
particular locals altogether.

* tapset/networking.stp (netdev.change_mac): Don't write mac
  intermediates into locals; just pass them directly to sprintf.
---
 tapset/networking.stp | 20 ++++++--------------
 1 file changed, 6 insertions(+), 14 deletions(-)

(limited to 'tapset/networking.stp')

diff --git a/tapset/networking.stp b/tapset/networking.stp
index 0c9d8afb..4732a72d 100644
--- a/tapset/networking.stp
+++ b/tapset/networking.stp
@@ -236,22 +236,14 @@ probe netdev.change_mac
 	mac_len = $dev->addr_len
 
 	// Old MAC Address
-	zero = $dev->dev_addr[0]
-	one =  $dev->dev_addr[1]
-	two =  $dev->dev_addr[2]
-	three =$dev->dev_addr[3]
-	four = $dev->dev_addr[4]
-	five = $dev->dev_addr[5]
 	old_mac = sprintf("%02x:%02x:%02x:%02x:%02x:%02x",
-			 zero, one, two, three, four, five)
+			  $dev->dev_addr[0], $dev->dev_addr[1],
+			  $dev->dev_addr[2], $dev->dev_addr[3],
+			  $dev->dev_addr[4], $dev->dev_addr[5])
 
 	// New MAC Address
-	zero = $sa->sa_data[0]
-	one  = $sa->sa_data[1]
-	two  = $sa->sa_data[2]
-	three =$sa->sa_data[3]
-	four  =$sa->sa_data[4]
-	five = $sa->sa_data[5]
 	new_mac = sprintf("%02x:%02x:%02x:%02x:%02x:%02x",
-			 zero, one, two, three, four, five)
+			  $sa->sa_data[0], $sa->sa_data[1],
+			  $sa->sa_data[2], $sa->sa_data[3],
+			  $sa->sa_data[4], $sa->sa_data[5])
 }
-- 
cgit