Index: openacs-4/packages/xotcl-core/tcl/50-protocol-handler-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/xotcl-core/tcl/50-protocol-handler-procs.tcl,v
diff -u -r1.1 -r1.2
--- openacs-4/packages/xotcl-core/tcl/50-protocol-handler-procs.tcl	23 Sep 2008 09:49:40 -0000	1.1
+++ openacs-4/packages/xotcl-core/tcl/50-protocol-handler-procs.tcl	3 Oct 2008 08:58:42 -0000	1.2
@@ -8,7 +8,7 @@
     Return connection information similar to ad_conn
   } {
     my log "--[self class] unknown called with '$method' <$args>"
-    switch [llength $args] {
+    switch -- [llength $args] {
       0 {if {[my exists $method]} {return [my set method]}
         return [ad_conn $method]
       }
Index: openacs-4/packages/xotcl-core/tcl/cr-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/xotcl-core/tcl/cr-procs.tcl,v
diff -u -r1.23 -r1.24
--- openacs-4/packages/xotcl-core/tcl/cr-procs.tcl	27 Sep 2008 17:18:39 -0000	1.23
+++ openacs-4/packages/xotcl-core/tcl/cr-procs.tcl	3 Oct 2008 08:58:42 -0000	1.24
@@ -470,7 +470,7 @@
       lappend atts $fq
     }
     foreach {slot_name slot} [my array get db_slot] {
-      switch $slot {
+      switch -- $slot {
 	::xo::db::CrItem::slot::text {
 	  # We need the rule, since insert the handling of the sql
 	  # attribute "text" is somewhat magic. On insert, one can use the
Index: openacs-4/packages/xotcl-core/tcl/http-client-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/xotcl-core/tcl/http-client-procs.tcl,v
diff -u -r1.15 -r1.16
--- openacs-4/packages/xotcl-core/tcl/http-client-procs.tcl	24 Sep 2008 09:58:41 -0000	1.15
+++ openacs-4/packages/xotcl-core/tcl/http-client-procs.tcl	3 Oct 2008 08:58:42 -0000	1.16
@@ -221,7 +221,7 @@
   }
 
   HttpCore instproc set_default_port {protocol} {
-    switch $protocol {
+    switch -- $protocol {
       http  {my set port 80}
       https {my set port 443}
     }
Index: openacs-4/packages/xotcl-core/tcl/policy-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/xotcl-core/tcl/policy-procs.tcl,v
diff -u -r1.16 -r1.17
--- openacs-4/packages/xotcl-core/tcl/policy-procs.tcl	24 Sep 2008 12:58:44 -0000	1.16
+++ openacs-4/packages/xotcl-core/tcl/policy-procs.tcl	3 Oct 2008 08:58:42 -0000	1.17
@@ -140,7 +140,7 @@
     if {$permission ne ""} {
       foreach {kind p} [my get_privilege -query_context $ctx $permission $object $method] break
       #my msg "--privilege = $p kind = $kind"
-      switch $kind {
+      switch -- $kind {
 	primitive {return [my check_privilege -login false \
 			       -package_id $package_id -user_id $user_id \
 			       $p $object $method]}
@@ -173,7 +173,7 @@
     set permission [my get_permission $object $method]
     if {$permission ne ""} {
       foreach {kind p} [my get_privilege $permission $object $method] break
-      switch $kind {
+      switch -- $kind {
 	primitive {
 	  set allowed [my check_privilege \
 			   -user_id $user_id -package_id $package_id \
Index: openacs-4/packages/xowiki/tcl/form-field-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/xowiki/tcl/form-field-procs.tcl,v
diff -u -r1.109 -r1.110
--- openacs-4/packages/xowiki/tcl/form-field-procs.tcl	2 Oct 2008 10:28:43 -0000	1.109
+++ openacs-4/packages/xowiki/tcl/form-field-procs.tcl	3 Oct 2008 08:59:18 -0000	1.110
@@ -220,7 +220,7 @@
       }
       return
     }
-    switch -glob $s {
+    switch -glob -- $s {
       optional    {my set required false}
       required    {my set required true; my remove_omit}
       omit        {my mixin add ::xowiki::formfield::omit}
Index: openacs-4/packages/xowiki/www/xinha/file-selector.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/xowiki/www/xinha/file-selector.tcl,v
diff -u -r1.10 -r1.11
--- openacs-4/packages/xowiki/www/xinha/file-selector.tcl	2 Oct 2008 07:43:37 -0000	1.10
+++ openacs-4/packages/xowiki/www/xinha/file-selector.tcl	3 Oct 2008 08:59:18 -0000	1.11
@@ -12,7 +12,7 @@
 } 
 
 set HTML_NothingSelected [_ acs-templating.HTMLArea_SelectImageNothingSelected]
-switch $selector_type {
+switch -- $selector_type {
   "image" {
     set HTML_Title  [_ acs-templating.HTMLArea_SelectImageTitle]
     set HTML_Legend [_ acs-templating.HTMLArea_SelectImage]