# HG changeset patch # User Matti Hamalainen # Date 1612949411 -7200 # Node ID 8c61b4032648935aa11d28e2f7d0b57c11d70993 # Parent ea6ebcf42b471b992f5d926e47b92e31ed833014 tj: Cleanup. Rename some variables to be more descriptive. Add a comment. diff -r ea6ebcf42b47 -r 8c61b4032648 tj.tcl --- a/tj.tcl Wed Feb 10 11:12:13 2021 +0200 +++ b/tj.tcl Wed Feb 10 11:30:11 2021 +0200 @@ -123,16 +123,12 @@ } -proc tj_get_tj_str {udelta} { +# Return string describing how many years,days,hours,etc +# the given number of seconds consists of +proc tj_get_tj_str {useconds} { - if {$udelta < 0} { - set utmp [expr -$udelta] - } else { - set utmp $udelta - } - - set uyears [expr ($utmp / (365*24*60*60))] - set urem [expr ($utmp % (365*24*60*60))] + set uyears [expr ($useconds / (365*24*60*60))] + set urem [expr ($useconds % (365*24*60*60))] set udays [expr ($urem / (24*60*60))] set urem [expr ($urem % (24*60*60))] set uhours [expr ($urem / (60*60))] @@ -160,12 +156,14 @@ if {$udelta < 0} { set ufmt "tj_past" + set useconds [expr -$udelta] } else { set ufmt "tj_remaining" + set useconds $udelta } # return [utl_str_map_values [tj_qm $ufmt] [list ]] - return [tj_get_tj_str $udelta] + return [tj_get_tj_str $useconds] } @@ -180,11 +178,13 @@ if {$udelta < 0} { set ufmt "tj_past" + set useconds [expr -$udelta] } else { set ufmt "tj_remaining" + set useconds $udelta } - tj_msg $upublic $unick $uchan $ufmt [list $uname $uid [tj_get_tj_str $udelta] [tj_ctime $ustamp]] + tj_msg $upublic $unick $uchan $ufmt [list $uname $uid [tj_get_tj_str $useconds] [tj_ctime $ustamp]] } if {!$nresults} {