From 354edef12f74d64a300d593970447ac81cd697c1 Mon Sep 17 00:00:00 2001
From: dms <dms@c11ca15a-4712-0410-83d8-924469b57eb5>
Date: Thu, 21 Nov 2002 13:08:11 +0000
Subject: [PATCH] - strictify - clean up Time2String to look better.

git-svn-id: https://svn.code.sf.net/p/infobot/code/trunk@648 c11ca15a-4712-0410-83d8-924469b57eb5
---
 blootbot/src/Misc.pl | 36 +++++++++++++++++++++---------------
 1 file changed, 21 insertions(+), 15 deletions(-)

diff --git a/blootbot/src/Misc.pl b/blootbot/src/Misc.pl
index 68e4fa4..027a7a7 100644
--- a/blootbot/src/Misc.pl
+++ b/blootbot/src/Misc.pl
@@ -5,7 +5,11 @@
 #      NOTE: Based on code by Kevin Lenzo & Patrick Cole  (c) 1997
 #
 
-#use strict;
+use strict;
+
+use vars qw(%file %mask %param %cmdstats %myModules);
+use vars qw($msgType $who $bot_pid $nuh $shm $force_public_reply
+	$no_timehires $bot_data_dir $addrchar);
 
 sub help {
     my $topic = shift;
@@ -164,29 +168,31 @@ sub IJoin {
 #####
 # Usage: &Time2String(seconds);
 sub Time2String {
-    my $time = shift;
-    my $retval;
+    my ($time) = @_;
+    my $prefix = "";
+    my (@s, @t);
 
-    return("NULL s") if (!defined $time or $time !~ /\d+/);
+    return "NULL" if (!defined $time);
+    return $time  if ($time !~ /\d+/);
 
-    my $prefix = "";
     if ($time < 0) {
 	$time	= - $time;
 	$prefix = "- ";
     }
 
-    my $s = int($time) % 60;
-    my $m = int($time / 60) % 60;
-    my $h = int($time / 3600) % 24;
-    my $d = int($time / 86400);
+    $t[0] = int($time) % 60;
+    $t[1] = int($time / 60) % 60;
+    $t[2] = int($time / 3600) % 24;
+    $t[3] = int($time / 86400);
 
-    my @data;
-    push(@data, sprintf("\002%d\002d", $d)) if ($d != 0);
-    push(@data, sprintf("\002%d\002h", $h)) if ($h != 0);
-    push(@data, sprintf("\002%d\002m", $m)) if ($m != 0);
-    push(@data, sprintf("\002%d\002s", $s)) if ($s != 0 or !@data);
+    push(@s, "$t[3]d") if ($t[3] != 0);
+    push(@s, "$t[2]h") if ($t[2] != 0);
+    push(@s, "$t[1]m") if ($t[1] != 0);
+    push(@s, "$t[0]s") if ($t[0] != 0 or !@s);
 
-    return $prefix.join(' ', @data);
+    my $retval = $prefix.join(' ', @s);
+    $retval =~ s/(\d+)/\002$1\002/g;
+    return $retval;
 }
 
 ###
-- 
2.39.5