added convenience function Sys_TimeString which calls strftime into a temporary buffe...

git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@3993 d7cf8633-e32d-0410-b094-e92efae38249

diff --git a/sys.h b/sys.h
index f42d2771efccf80cbc6b1c7ca80d7b185df822c4..689f2b93f03cc4e6c8586db64204a3ce7d0aa7f6 100644 (file)
--- a/sys.h
+++ b/sys.h
@@ -80,5 +80,8 @@ void Sys_Shared_EarlyInit (void);
 // called after Host_init
 void Sys_Shared_LateInit (void);
 
 // called after Host_init
 void Sys_Shared_LateInit (void);
 

+// returns current timestamp
+char *Sys_TimeString(const char *timeformat);
+

 #endif
 
 #endif
 

diff --git a/sys_shared.c b/sys_shared.c
index d1bc7fe60c90029f8bbdcb2e35b4b644fdecdb47..a8016fa7cc371bc2b8ec2a1c4ae5bffe2b39b4b7 100644 (file)
--- a/sys_shared.c
+++ b/sys_shared.c
@@ -48,14 +48,20 @@ static char qfont_table[256] = {
        'x',  'y',  'z',  '{',  '|',  '}',  '~',  '<'
 };
 
        'x',  'y',  'z',  '{',  '|',  '}',  '~',  '<'
 };
 

+static char sys_timestring[128];
+char *Sys_TimeString(const char *timeformat)
+{
+       time_t mytime = time(NULL);
+       strftime(sys_timestring, sizeof(sys_timestring), timeformat, localtime(&mytime));
+       return sys_timestring;
+}
+

 
 #define MAXPRINTMSG 16384
 
 void Sys_Print(const char *msg)
 {
        unsigned char *p;
 
 #define MAXPRINTMSG 16384
 
 void Sys_Print(const char *msg)
 {
        unsigned char *p;

-       // Time stamp
-       char stamp[128];

        // String we print
        char final[MAXPRINTMSG];
 
        // String we print
        char final[MAXPRINTMSG];
 


@@ -63,11 +69,7 @@ void Sys_Print(const char *msg)
                return;
 
        if (timestamps.integer)
                return;
 
        if (timestamps.integer)

-       {
-               time_t mytime = time(NULL);
-               strftime(stamp, sizeof(stamp), timeformat.string, localtime(&mytime));
-               snprintf(final, sizeof(final), "%s%s", stamp, msg);
-       }
+               snprintf(final, sizeof(final), "%s%s", Sys_TimeString(timeformat.string), msg);

        else
                strncpy(final, msg, sizeof(final));
 
        else
                strncpy(final, msg, sizeof(final));