zy1000 1.49 snapshot

git-svn-id: svn://svn.berlios.de/openocd/trunk@1374 b42882b7-edfa-0310-969c-e2dbd0fdcd60

diff --git a/src/helper/startup.tcl b/src/helper/startup.tcl
index 41137f1adb204a46f48afd782b59340c24c19f85..eb965e009d2fd74b2795044f882fcdcb2137ffb9 100644 (file)
--- a/src/helper/startup.tcl
+++ b/src/helper/startup.tcl
@@ -303,3 +303,11 @@ add_help_text srst_deasserted "Overridable procedure run when srst deassert is d
 proc srst_asserted {} {
        puts "Sensed nSRST asserted."
 }
+
+# catch any exceptions, capture output and return output
+proc capture_catch {a} {
+       catch {
+               capture {uplevel $a}
+       } result
+       return $result 
+}

diff --git a/src/server/httpd/httpd.tcl b/src/server/httpd/httpd.tcl
index a2fee129d4906dc7fcb347aa34714481b921706c..5b012681a6061c434d3d3d92e54faaaa9cfca2d9 100644 (file)
--- a/src/server/httpd/httpd.tcl
+++ b/src/server/httpd/httpd.tcl
@@ -99,14 +99,6 @@ proc encode {a} {
        return [string map {\n <br/> { } {&nbsp;} \t {&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;} > &gt; < &lt; / &#47;} $a]
 }
 
-# catch any exceptions, capture output and return it 
-proc capture_catch {a} {
-       catch {
-               capture {uplevel $a}
-       } result
-       return $result 
-}
-
 proc first_flash_base {} {
        set t [lindex 0 [ocd_flash_banks]]
        return $t(base)