summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authoroharboe <oharboe@b42882b7-edfa-0310-969c-e2dbd0fdcd60>2009-02-17 11:54:30 +0000
committeroharboe <oharboe@b42882b7-edfa-0310-969c-e2dbd0fdcd60>2009-02-17 11:54:30 +0000
commit2136238908840dd230854cb5d78b8da181ca7340 (patch)
tree579abd802ac115944e8a85c9bd1f2e59d57a31f6
parent3fb2c6a6dd2ac88cfe88e0ccc14e8a650fa755ca (diff)
downloadopenocd_libswd-2136238908840dd230854cb5d78b8da181ca7340.tar.gz
openocd_libswd-2136238908840dd230854cb5d78b8da181ca7340.tar.bz2
openocd_libswd-2136238908840dd230854cb5d78b8da181ca7340.tar.xz
openocd_libswd-2136238908840dd230854cb5d78b8da181ca7340.zip
zy1000 1.49 snapshot
git-svn-id: svn://svn.berlios.de/openocd/trunk@1374 b42882b7-edfa-0310-969c-e2dbd0fdcd60
-rw-r--r--src/helper/startup.tcl8
-rw-r--r--src/server/httpd/httpd.tcl8
2 files changed, 8 insertions, 8 deletions
diff --git a/src/helper/startup.tcl b/src/helper/startup.tcl
index 41137f1a..eb965e00 100644
--- 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 a2fee129..5b012681 100644
--- 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)