Whitespace trim & diff reduction against HEAD.

Bug found by:
Submitted by:
Requested by:
Reviewed by:
Approved by:
Obtained from:

diff --git a/editor.tcl b/editor.tcl
index b9c8f8739e61266a034865fc553b5e1d799847fd..5be6a09aa94f404dbf989cdfda72eaea97017167 100755 (executable)
--- a/editor.tcl
+++ b/editor.tcl
@@ -1,4 +1,4 @@
-# $Id: editor.tcl,v 1.62.2.5 2007/07/19 03:31:21 marko Exp $ 
+# $Id: editor.tcl,v 1.62.2.6 2007/07/19 04:45:07 marko Exp $ 
 #
 # Copyright 2004, 2005 University of Zagreb, Croatia.  All rights reserved.
 #
@@ -402,7 +402,7 @@ proc drawLink { link } {
     } else {
        set newlink [.c create line 0 0 0 0 \
            -fill [getLinkColor $link] -width $lwidth \
-       -tags "link $link $lnode1 $lnode2"]
+           -tags "link $link $lnode1 $lnode2"]
     }
     # XXX Invisible pseudo-liks
     global invisible
@@ -520,19 +520,19 @@ proc calcDxDy { lnode } {
     switch -exact -- [nodeType $lnode] {
        frswitch {
            set x [expr {1.8 / $zoom}]
-       set y [expr {1.8 / $zoom}]
+           set y [expr {1.8 / $zoom}]
        }
        hub {
-       set x [expr {1.5 / $zoom}]
-       set y [expr {2.6 / $zoom}]
+           set x [expr {1.5 / $zoom}]
+           set y [expr {2.6 / $zoom}]
        }
        lanswitch {
-       set x [expr {1.5 / $zoom}]
-       set y [expr {2.6 / $zoom}]
+           set x [expr {1.5 / $zoom}]
+           set y [expr {2.6 / $zoom}]
        }
        router {
            set x [expr {1 / $zoom}]
-       set y [expr {2 / $zoom}]
+           set y [expr {2 / $zoom}]
        }
        pc {
            if { $showIfIPaddrs || $showIfIPv6addrs } {
@@ -587,16 +587,13 @@ proc updateIfcLabel { lnode1 lnode2 } {
        set labelstr ""
     }
     if { $showIfNames } {
-       set labelstr "$labelstr$ifc
-"
+       set labelstr "$labelstr$ifc\r"
     }
     if { $showIfIPaddrs && $ifipv4addr != "" } {
-       set labelstr "$labelstr$ifipv4addr
-"
+       set labelstr "$labelstr$ifipv4addr\r"
     }
     if { $showIfIPv6addrs && $ifipv6addr != "" } {
-       set labelstr "$labelstr$ifipv6addr
-"
+       set labelstr "$labelstr$ifipv6addr\r"
     }
     set labelstr \
        [string range $labelstr 0 [expr {[string length $labelstr] - 2}]]
@@ -623,21 +620,17 @@ proc updateLinkLabel { link } {
     set delstr [getLinkDelayString $link]
     set ber [getLinkBER $link]
     set dup [getLinkDup $link]
-    set labelstr "$labelstr[getLinkBandwidthString $link]
-"
+    set labelstr "$labelstr[getLinkBandwidthString $link]\r"
     if { "$delstr" != "" } {
-       set labelstr "$labelstr$delstr
-"
+       set labelstr "$labelstr$delstr\r"
     }
     if { "$ber" != "" } {
        set berstr "ber=$ber"
-       set labelstr "$labelstr$berstr
-"
+       set labelstr "$labelstr$berstr\r"
     }
     if { "$dup" != "" } {
        set dupstr "dup=$dup%"
-       set labelstr "$labelstr$dupstr
-"
+       set labelstr "$labelstr$dupstr\r"
     }
     set labelstr \
        [string range $labelstr 0 [expr {[string length $labelstr] - 2}]]
@@ -761,10 +754,10 @@ proc splitGUILink { link } {
 
     setNodeCoords $new_node1 \
        "[expr {($x1 + 0.4 * ($x2 - $x1)) / $zoom}] \
-        [expr {($y1 + 0.4 * ($y2 - $y1)) / $zoom}]"
+       [expr {($y1 + 0.4 * ($y2 - $y1)) / $zoom}]"
     setNodeCoords $new_node2 \
        "[expr {($x1 + 0.6 * ($x2 - $x1)) / $zoom}] \
-        [expr {($y1 + 0.6 * ($y2 - $y1)) / $zoom}]"
+       [expr {($y1 + 0.6 * ($y2 - $y1)) / $zoom}]"
     setNodeLabelCoords $new_node1 [getNodeCoords $new_node1]
     setNodeLabelCoords $new_node2 [getNodeCoords $new_node2]
 
@@ -1108,15 +1101,15 @@ proc button3node { c x y } {
     .button3menu.connect add cascade -label "Selected" \
        -menu .button3menu.connect.selected
     .button3menu.connect.selected add command \
-           -label "Chain" -command "P \[selectedRealNodes\]"
+       -label "Chain" -command "P \[selectedRealNodes\]"
     .button3menu.connect.selected add command \
-           -label "Star" \
-           -command "Kb \[lindex \[selectedRealNodes\] 0\] \
-               \[lrange \[selectedNodes\] 1 end\]"
+       -label "Star" \
+       -command "Kb \[lindex \[selectedRealNodes\] 0\] \
+       \[lrange \[selectedNodes\] 1 end\]"
     .button3menu.connect.selected add command \
-           -label "Cycle" -command "C \[selectedRealNodes\]"
+       -label "Cycle" -command "C \[selectedRealNodes\]"
     .button3menu.connect.selected add command \
-           -label "Clique" -command "K \[selectedRealNodes\]"
+       -label "Clique" -command "K \[selectedRealNodes\]"
     .button3menu.connect add separator
     foreach canvas $canvas_list {
        destroy .button3menu.connect.$canvas
@@ -1263,15 +1256,15 @@ proc spawnShell { node cmd } {
        nexec vimageShellServer.sh $node_id 1234 $cmd &
        if { $gui_unix } {
            exec xterm -sb -rightbar \
-                   -T "IMUNES: [getNodeName $node] (console)" \
-                   -e "nc $exec_host 1234" &
+               -T "IMUNES: [getNodeName $node] (console)" \
+               -e "nc $exec_host 1234" &
        } else {
            exec cmd /c nc $exec_host 1234 &
        }
     } else {
        nexec xterm -sb -rightbar \
-               -T "IMUNES: [getNodeName $node] (console)" \
-               -e "vimage $node_id $cmd" &
+           -T "IMUNES: [getNodeName $node] (console)" \
+           -e "vimage $node_id $cmd" &
     }
 }
 
@@ -1336,8 +1329,8 @@ proc button1 { c x y button } {
        [nodeType [lindex [$c gettags $curobj] 1]] == "pseudo") } {
        set node [lindex [$c gettags current] 1]
        set wasselected \
-       [expr {[lsearch [$c find withtag "selected"] \
-       [$c find withtag "node && $node"]] > -1}]
+           [expr {[lsearch [$c find withtag "selected"] \
+           [$c find withtag "node && $node"]] > -1}]
        if { $button == "ctrl" } {
            if { $wasselected } {
                $c dtag $node selected
@@ -1418,7 +1411,7 @@ proc button1 { c x y button } {
            selectNode $c [$c find withtag "node && $node"]
            set changed 1
        } elseif { $activetool == "select" \
-               && $curtype != "node" && $curtype != "nodelabel"} {
+           && $curtype != "node" && $curtype != "nodelabel"} {
            $c config -cursor cross
            set lastX $x
            set lastY $y
@@ -1446,7 +1439,7 @@ proc button1 { c x y button } {
            set lastY [lindex [$c coords $curobj] 1]
            set newlink [$c create line $lastX $lastY $x $y \
                -fill $defLinkColor -width $defLinkWidth \
-                   -tags "link"]
+               -tags "link"]
        }
     }
 
@@ -2212,8 +2205,7 @@ proc popupConfigDialog { c } {
            text $wi.statrt.cfg.text -font arial -bg white \
                -width 42 -height $h -takefocus 0
            foreach route $routes {
-               $wi.statrt.cfg.text insert end "$route
-"
+               $wi.statrt.cfg.text insert end "$route\r"
            }
            pack $wi.statrt.cfg.text -expand yes
            pack $wi.statrt.tab $wi.statrt.cfg $wi.statrt.tab1 -side left
@@ -2460,8 +2452,8 @@ proc cfgGenerate { node } {
 # INPUTS
 #   * node_id -- node id
 #   * deleted -- if deleted is set to 1, editStartupCfg
-#              has been invoked after deleting custom-config
-#              with specified custom-config-id.
+#               has been invoked after deleting custom-config
+#               with specified custom-config-id.
 #****
 proc editStartupCfg { node deleted } {
     global viewcustomid
@@ -2482,7 +2474,7 @@ proc editStartupCfg { node deleted } {
 
     if { $customidlist == "" } {
        set warning "Custom config list is empty."
-           tk_messageBox -message $warning -type ok -icon warning \
+       tk_messageBox -message $warning -type ok -icon warning \
            -title "Custom configuration warning"       
     } else {
        set w .cfgeditor
@@ -2692,8 +2684,8 @@ proc popupConfigApply { wi object_type target phase } {
            set ifoperstate [subst $[subst ifoper$ifc]]
            set oldifoperstate [getIfcOperState $target $ifc]
            if { $ifoperstate != $oldifoperstate } {
-           setIfcOperState $target $ifc $ifoperstate
-           set changed 1
+               setIfcOperState $target $ifc $ifoperstate
+               set changed 1
            }
 
            #
@@ -2702,21 +2694,21 @@ proc popupConfigApply { wi object_type target phase } {
            set ipaddr [$wi.if$ifc.cfg.ipv4.addrv get]
            set oldipaddr [getIfcIPv4addr $target $ifc]
            if { $ipaddr != $oldipaddr } {
-           setIfcIPv4addr $target $ifc $ipaddr
-           set changed 1
+               setIfcIPv4addr $target $ifc $ipaddr
+               set changed 1
            }
            set ipaddr [$wi.if$ifc.cfg.ipv6.addrv get]
            set oldipaddr [getIfcIPv6addr $target $ifc]
            if { $ipaddr != $oldipaddr } {
-           setIfcIPv6addr $target $ifc $ipaddr
-           set changed 1
+               setIfcIPv6addr $target $ifc $ipaddr
+               set changed 1
            }
 
            set mtu [$wi.if$ifc.label.mtuv get]
            set oldmtu [getIfcMTU $target $ifc]
            if { $mtu != $oldmtu } {
-           setIfcMTU $target $ifc $mtu
-           set changed 1
+               setIfcMTU $target $ifc $mtu
+               set changed 1
            }
 
        }
@@ -2730,32 +2722,29 @@ proc popupConfigApply { wi object_type target phase } {
            set text [$wi.statrt.cfg.text get $i.0 $i.end]
            set rtentry [lrange [split [string trim $text]] 0 2]
            if { $rtentry == "" } {
-           break
+               break
            }
            set dst [lindex $rtentry 0]
            set gw [lindex $rtentry 1]
            set metric [lindex $rtentry 2]
-           if { [string is integer $metric] != 1 || \
-             $metric > 65535 } {
-           break
-           }
-           if { [checkIPv4Net $dst] == 1 } {
-           if { [checkIPv4Addr $gw] == 1 } {
-               lappend newIPv4statrtes \
-               [string trim "$dst $gw $metric"]
-           } else {
+           if { [string is integer $metric] != 1 || $metric > 65535 } {
                break
            }
+           if { [checkIPv4Net $dst] == 1 } {
+               if { [checkIPv4Addr $gw] == 1 } {
+                   lappend newIPv4statrtes [string trim "$dst $gw $metric"]
+               } else {
+                   break
+               }
            } elseif { [checkIPv6Net $dst] == 1 } {
-           if { [checkIPv6Addr $gw] == 1 } {
-               lappend newIPv6statrtes \
-               [string trim "$dst $gw $metric"]
+               if { [checkIPv6Addr $gw] == 1 } {
+                   lappend newIPv6statrtes [string trim "$dst $gw $metric"]
+               } else {
+                   break
+               }
            } else {
                break
            }
-           } else {
-           break
-           }
            incr i
        }
        set newIPv4statrtes [lsort $newIPv4statrtes]
@@ -2775,9 +2764,9 @@ proc popupConfigApply { wi object_type target phase } {
            set changed 1
        }
 
-               if { $showIPsecConfig == 0 } {
-                       set ipsecEnabled 0
-               }
+       if { $showIPsecConfig == 0 } {
+           set ipsecEnabled 0
+       }
        set oldipsecenabled [getIpsecEnabled $target]
        if {$oldipsecenabled != $ipsecEnabled} {
            setIpsecEnabled $target $ipsecEnabled
@@ -2802,7 +2791,7 @@ proc popupConfigApply { wi object_type target phase } {
            setNodeCPUConf $target [list $newcpuconf]
            set changed 1
        }
-       }
+    } # XXX node
     }
 
     #
@@ -2860,7 +2849,7 @@ proc popupConfigApply { wi object_type target phase } {
        if { $changed == 1 && $oper_mode == "exec" } {
            execSetLinkParams $eid $target
        }
-    }
+    } # XXX link
     }
     if { $changed == 1 } {
        redrawAll