Mercurial > hg > egg-tcls

changeset 614:8c61b4032648

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
tj: Cleanup. Rename some variables to be more descriptive. Add a comment.
author Matti Hamalainen <ccr@tnsp.org>
date Wed, 10 Feb 2021 11:30:11 +0200
parents ea6ebcf42b47
children 1dac9129eb0f
files tj.tcl
diffstat 1 files changed, 11 insertions(+), 11 deletions(-) [+]
line wrap: on
line diff
--- 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} {