Changeset 0071c88

Timestamp:

Aug 1, 2011, 11:28:43 PM (12 years ago)

Author:

David Benjamin <davidben@mit.edu>

Children:

2e42098

Parents:

9078f69

git-author:

David Benjamin <davidben@mit.edu> (08/01/11 02:03:32)

git-committer:

David Benjamin <davidben@mit.edu> (08/01/11 23:28:43)

Message:

Restore correct semantics of message 'time' attribute

This rewrites part of 4ebbfbc5360fa004637dd101f5a0c833cdccd60a. We can't
replace every instance of ctime with a user-formatted time, as the time
attribute is not user-formatted. It is (unfortunately) the API for perl
to override the timestamp and owl_perlconfig_hashref2message expects a
particular format for strptime. We should not then flip the values
around once they reach C. (Especially not a locale-dependent one.)

Rename *_to_timestr functions to owl_util_format_* so it is clear the
function should only be used for user-formatted times.

Files:

• functions.c (modified) (6 diffs)
• message.c (modified) (3 diffs)
• util.c (modified) (2 diffs)

functions.c

@@ -1229 +1229 @@
   now = time(NULL);
 
-  tmpbuff = owl_util_time_to_timestr(localtime(&now));
+  tmpbuff = owl_util_format_time(localtime(&now));
   fprintf(file, "[%d -  %s - %lds]: ",
           (int) getpid(), tmpbuff, now - owl_global_get_starttime(&g));
@@ -1379 +1379 @@
   owl_fmtext fm, attrfm;
   const owl_view *v;
+  char *time;
 #ifdef HAVE_LIBZEPHYR
   const ZNotice_t *n;
@@ -1409 +1410 @@
   }
 
-  owl_fmtext_appendf_normal(&fm, "  Time      : %s\n", owl_message_get_timestr(m));
+  time = owl_message_format_time(m);
+  owl_fmtext_appendf_normal(&fm, "  Time      : %s\n", time);
+  g_free(time);
 
   if (!owl_message_is_type_admin(m)) {
@@ -1782 +1785 @@
   owl_fmtext_append_normal(&fm, "\n");
 
-  tmpbuff = owl_util_time_to_timestr(localtime(&start));
+  tmpbuff = owl_util_format_time(localtime(&start));
   owl_fmtext_appendf_normal(&fm, "  Startup Time: %s\n", tmpbuff);
   g_free(tmpbuff);
@@ -3078 +3081 @@
       idle=owl_buddy_get_idle_time(b);
       if (idle!=0) {
-        timestr=owl_util_minutes_to_timestr(idle);
+        timestr=owl_util_format_minutes(idle);
       } else {
         timestr=g_strdup("");
@@ -3407 +3410 @@
 
   now = time(NULL);
-  date = owl_util_time_to_timestr(localtime(&now));
+  date = owl_util_format_time(localtime(&now));
 
   buff = g_strdup_printf("%s %s", date, string);

message.c

@@ -43 +43 @@
   /* save the time */
   m->time = time(NULL);
-  m->timestr = owl_util_time_to_timestr(localtime(&m->time));
+  m->timestr = g_strdup(ctime(&m->time));
+  m->timestr[strlen(m->timestr)-1] = '\0';
 
   m->fmtext = NULL;
@@ -344 +345 @@
   if (m->timestr) return(m->timestr);
   return("");
+}
+
+CALLER_OWN char *owl_message_format_time(const owl_message *m)
+{
+  return owl_util_format_time(localtime(&m->time));
 }
 
@@ -793 +799 @@
   if (m->timestr) g_free(m->timestr);
   m->time = n->z_time.tv_sec;
-  m->timestr = owl_util_time_to_timestr(localtime(&m->time));
+  m->timestr = g_strdup(ctime(&m->time));
+  m->timestr[strlen(m->timestr)-1] = '\0';
 
   /* set other info */

util.c

@@ -268 +268 @@
 
 /* caller must free the return */
-CALLER_OWN char *owl_util_minutes_to_timestr(int in)
+CALLER_OWN char *owl_util_format_minutes(int in)
 {
   int days, hours;
@@ -289 +289 @@
 }
 
-CALLER_OWN char *owl_util_time_to_timestr(const struct tm *time)
+CALLER_OWN char *owl_util_format_time(const struct tm *time)
 {
   /* 32 chosen for first attempt because timestr will end up being