Changeset bcb84df for functions.c


Ignore:
Timestamp:
Sep 11, 2011, 1:18:14 PM (10 years ago)
Author:
GitHub Merge Button <merge-button@github.com>
Parents:
6646fdb (diff), 8a13ea3 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.
Message:
Merge 8a13ea3063191e5cf58fc382cafe76511c6cf056 into 6646fdb981a88a6548cbc3da4b4963330fe1c7d6
File:
1 edited

Legend:

Unmodified
Added
Removed
  • functions.c

    r3b17b57 r6646fdb  
    12231223  now = time(NULL);
    12241224
    1225   tmpbuff = owl_util_time_to_timestr(localtime(&now));
     1225  tmpbuff = owl_util_format_time(localtime(&now));
    12261226  fprintf(file, "[%d -  %s - %lds]: ",
    12271227          (int) getpid(), tmpbuff, now - owl_global_get_starttime(&g));
     
    13731373  owl_fmtext fm, attrfm;
    13741374  const owl_view *v;
     1375  char *time;
    13751376#ifdef HAVE_LIBZEPHYR
    13761377  const ZNotice_t *n;
     
    14031404  }
    14041405
    1405   owl_fmtext_appendf_normal(&fm, "  Time      : %s\n", owl_message_get_timestr(m));
     1406  time = owl_message_format_time(m);
     1407  owl_fmtext_appendf_normal(&fm, "  Time      : %s\n", time);
     1408  g_free(time);
    14061409
    14071410  if (!owl_message_is_type_admin(m)) {
     
    17761779  owl_fmtext_append_normal(&fm, "\n");
    17771780
    1778   tmpbuff = owl_util_time_to_timestr(localtime(&start));
     1781  tmpbuff = owl_util_format_time(localtime(&start));
    17791782  owl_fmtext_appendf_normal(&fm, "  Startup Time: %s\n", tmpbuff);
    17801783  g_free(tmpbuff);
     
    30723075      idle=owl_buddy_get_idle_time(b);
    30733076      if (idle!=0) {
    3074         timestr=owl_util_minutes_to_timestr(idle);
     3077        timestr=owl_util_format_minutes(idle);
    30753078      } else {
    30763079        timestr=g_strdup("");
     
    34013404
    34023405  now = time(NULL);
    3403   date = owl_util_time_to_timestr(localtime(&now));
     3406  date = owl_util_format_time(localtime(&now));
    34043407
    34053408  buff = g_strdup_printf("%s %s", date, string);
Note: See TracChangeset for help on using the changeset viewer.