Extract morgue file time formatting into make_file_time.

3 files changed, 23 insertions, 13 deletions

diff --git a/crawl-ref/source/ouch.cc b/crawl-ref/source/ouch.cc
index 6eecfaacac..c76fd18148 100644
--- a/crawl-ref/source/ouch.cc
+++ b/crawl-ref/source/ouch.cc
@@ -12,7 +12,6 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <ctype.h>
-#include <time.h>
 
 #ifdef TARGET_OS_DOS
 #include <conio.h>
@@ -1202,18 +1201,10 @@ static std::string morgue_name(time_t when_crawl_got_even)
 #else  // !SHORT_FILE_NAMES
     std::string name = "morgue-" + you.your_name;
 
-    if (tm *loc = TIME_FN(&when_crawl_got_even))
-    {
-        char buf[25];
-        snprintf(buf, sizeof buf, "-%04d%02d%02d-%02d%02d%02d",
-                 loc->tm_year + 1900,
-                 loc->tm_mon + 1,
-                 loc->tm_mday,
-                 loc->tm_hour,
-                 loc->tm_min,
-                 loc->tm_sec);
-        name += buf;
-    }
+    std::string time = make_file_time(when_crawl_got_even);
+    if (!time.empty())
+        name += "-" + time;
+
     return (name);
 #endif // SHORT_FILE_NAMES
 }
diff --git a/crawl-ref/source/stuff.cc b/crawl-ref/source/stuff.cc
index fa7c276f68..b447c4be30 100644
--- a/crawl-ref/source/stuff.cc
+++ b/crawl-ref/source/stuff.cc
@@ -142,6 +142,23 @@ std::string make_time_string(time_t abs_time, bool terse)
     return buff.str();
 }
 
+std::string make_file_time(time_t when)
+{
+    if (tm *loc = TIME_FN(&when))
+    {
+        char buf[25];
+        snprintf(buf, sizeof buf, "%04d%02d%02d-%02d%02d%02d",
+                 loc->tm_year + 1900,
+                 loc->tm_mon + 1,
+                 loc->tm_mday,
+                 loc->tm_hour,
+                 loc->tm_min,
+                 loc->tm_sec);
+        return (buf);
+    }
+    return ("");
+}
+
 void set_redraw_status(unsigned long flags)
 {
     you.redraw_status_flags |= flags;
diff --git a/crawl-ref/source/stuff.h b/crawl-ref/source/stuff.h
index 3bf452fb49..4a7fab6c11 100644
--- a/crawl-ref/source/stuff.h
+++ b/crawl-ref/source/stuff.h
@@ -13,6 +13,8 @@
 #include <map>
 
 std::string make_time_string(time_t abs_time, bool terse = false);
+std::string make_file_time(time_t when);
+
 void set_redraw_status(unsigned long flags);
 void tag_followers();
 void untag_followers();