[OpenOCD-commit] Main OpenOCD repository branch, master, updated. v0.12.0-592-gb5e711804

[openocd-gerrit <ope...@us...>]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "Main OpenOCD repository".

The branch, master has been updated
       via  b5e7118048250a4ffc589fd8b82a11de05132d23 (commit)
       via  7050cade9dcea77dd9882669ea97fddc6a8084d4 (commit)
      from  223e3d8fe76d86f01111bbe37f83a19d719ac81a (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit b5e7118048250a4ffc589fd8b82a11de05132d23
Author: Noah Moroze <noa...@gm...>
Date:   Wed May 15 22:50:58 2024 -0400

    src/helper/startup: fix syntax errors
    
    The missing closing brackets were caught by tclint v0.2.5
    (https://github.com/nmoroze/tclint):
    
    ```
    tclint src/helper/startup.tcl | grep "syntax error"
    ```
    
    The improperly escaped backslash was caught by manual inspection during
    code review.
    
    Change-Id: I8cd44e58040d4627f6b2fc8b88ca8a930cda0ba6
    Signed-off-by: Noah Moroze <noa...@gm...>
    Reviewed-on: https://review.openocd.org/c/openocd/+/8282
    Tested-by: jenkins
    Reviewed-by: Antonio Borneo <bor...@gm...>

diff --git a/src/helper/startup.tcl b/src/helper/startup.tcl
index 5a0d479f5..e6e76e68f 100644
--- a/src/helper/startup.tcl
+++ b/src/helper/startup.tcl
@@ -11,10 +11,10 @@ proc find {filename} {
 	if {[catch {ocd_find $filename} t]==0} {
 		return $t
 	}
-	if {[catch {ocd_find [string map {\ /} $filename} t]==0} {
+	if {[catch {ocd_find [string map {\\ /} $filename]} t]==0} {
 		return $t
 	}
-	if {[catch {ocd_find [string map {/ \\} $filename} t]==0} {
+	if {[catch {ocd_find [string map {/ \\} $filename]} t]==0} {
 		return $t
 	}
 	# make sure error message matches original input string

commit 7050cade9dcea77dd9882669ea97fddc6a8084d4
Author: Noah Moroze <noa...@gm...>
Date:   Wed May 15 22:49:23 2024 -0400

    tcl/chip/st/spear: fix syntax errors
    
    While the current jimtcl does not consider this an error, the Tcl
    dodekalogue states that strings terminate at the second double quote
    character (see https://www.tcl.tk/man/tcl/TclCmd/Tcl.htm#M8).
    
    These syntax errors were caught by tclint v0.2.5
    (https://github.com/nmoroze/tclint):
    
    ```
    tclint tcl/chip/st/spear/spear3xx_ddr.tcl | grep "syntax error"
    ```
    
    Change-Id: I2763d93095e3db7590644652f16b7b24939d6cae
    Signed-off-by: Noah Moroze <noa...@gm...>
    Reviewed-on: https://review.openocd.org/c/openocd/+/8281
    Tested-by: jenkins
    Reviewed-by: Tomas Vanek <va...@fb...>
    Reviewed-by: Antonio Borneo <bor...@gm...>

diff --git a/tcl/chip/st/spear/spear3xx_ddr.tcl b/tcl/chip/st/spear/spear3xx_ddr.tcl
index 59925672d..06962215b 100644
--- a/tcl/chip/st/spear/spear3xx_ddr.tcl
+++ b/tcl/chip/st/spear/spear3xx_ddr.tcl
@@ -10,7 +10,7 @@
 
 proc sp3xx_ddr_init {ddr_type {ddr_chips 1}} {
 	if { $ddr_chips != 1 && $ddr_chips != 2 } {
-		error "Only 1 or 2 DDR chips permitted. Wrong value "$ddr_chips
+		error "Only 1 or 2 DDR chips permitted. Wrong value $ddr_chips"
 	}
 
 	if { $ddr_type == "mt47h64m16_3_333_cl5_async" } {
@@ -21,7 +21,7 @@ proc sp3xx_ddr_init {ddr_type {ddr_chips 1}} {
 	#	????? $ddr_chips
 	#	set ddr_size 0x?????
 	} else {
-		error "sp3xx_ddr_init: unrecognized DDR type "$ddr_type
+		error "sp3xx_ddr_init: unrecognized DDR type $ddr_type"
 	}
 
 	# MPMC START

-----------------------------------------------------------------------

Summary of changes:
 src/helper/startup.tcl             | 4 ++--
 tcl/chip/st/spear/spear3xx_ddr.tcl | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)


hooks/post-receive
-- 
Main OpenOCD repository