more UTF-8 fixes

This commit is contained in:
HummyPkg 2017-03-12 19:35:47 +00:00
parent be1b26378e
commit 03d526549c
2 changed files with 4 additions and 4 deletions

View File

@ -668,7 +668,7 @@ proc {rsv construct} {event type} {
set args(nsttime) [$event get start] set args(nsttime) [$event get start]
set args(nduration) [$event get duration] set args(nduration) [$event get duration]
set args(usevtid) [$event get event_id] set args(usevtid) [$event get event_id]
set args(szevtname) "\025[$event get name]" set args(szevtname) "\025[xconv [$event get name]]"
set args(eReady) 30 set args(eReady) 30
lassign [system padding] args(ulPreOffset) args(ulPostOffset) lassign [system padding] args(ulPreOffset) args(ulPostOffset)

View File

@ -656,13 +656,13 @@ proc {system nuggeted} {} {
proc {system strip} {str} { proc {system strip} {str} {
if {[string range $str 1 2] eq "i7"} { if {[string range $str 1 2] eq "i7"} {
# ISO6937, convert to UTF-8 # ISO6937, convert to UTF-8
set str [xconv [string range $str 3 end]] return [xconv [string range $str 3 end]]
} }
if {[string first "\025" $str] == 0} { if {[string first "\025" $str] == 0} {
# UTF-8 # UTF-8
set str [string range $str 1 end] return [string range $str 1 end]
} }
return $str return [xconv $str]
} }
proc {system usbdisks} {{full 0}} { proc {system usbdisks} {{full 0}} {