Changeset 4473 for trunk/base

Timestamp:

Jan 6, 2004, 5:04:36 AM (20 years ago)

Author:

jkh

Message:

Fix ldelete to return a modified list, just as the other l* procs do. This
fixes the root cause of the ethereal port problem. Since this is the case,
also remove the safety-belt added to options_proc_trace since it's no longer
necessary and I'd just as soon have it error out to avoid masking future
problems of this nature. Many thanks to Toby for tracking this down!

Submitted by: Toby Peterson <tp62@…>

File:

• trunk/base/src/port1.0/portutil.tcl (modified) (3 diffs)

trunk/base/src/port1.0/portutil.tcl

@@ -109 +109 @@
                 \if \{!\[info exists user_options(${option})\]\} \{ \n\
                     foreach val \$args \{ \n\
-                        ldelete ${option} \$val \n\
+                       set ${option} \[ldelete \$\{$option\} \$val\] \n\
                     \} \n\
                     if \{\[string length \$\{${option}\}\] == 0\} \{ \n\
@@ -179 +179 @@
     global option_procs
     upvar $optionName optionValue
-    if {![info exists option_procs($optionName)]} {
-        return
-    }
     switch $op {
         w {
@@ -421 +418 @@
 # Deletes a value from the supplied list
 proc ldelete {list value} {
-    upvar $list uplist
-    set ix [lsearch -exact $uplist $value]
+    set ix [lsearch -exact $list $value]
     if {$ix >= 0} {
-        set uplist [lreplace $uplist $ix $ix]
-    }
+        return [lreplace $list $ix $ix]
+    }
+    return $list
 }