Changes in / [85bb19b:a7fac14]

Files:

• functions.c (modified) (5 diffs)
• message.c (modified) (2 diffs)
• perl/modules/Twitter/lib/BarnOwl/Module/Twitter/Handle.pm (modified) (2 diffs)
• util.c (modified) (1 diff)

functions.c

@@ -1223 +1223 @@
 void G_GNUC_PRINTF(1, 2) owl_function_debugmsg(const char *fmt, ...)
 {
-  char *tmpbuff;
   FILE *file;
   time_t now;
@@ -1238 +1237 @@
   now = time(NULL);
 
-  tmpbuff = owl_util_time_to_timestr(localtime(&now));
-  fprintf(file, "[%d -  %s - %lds]: ",
-          (int) getpid(), tmpbuff, now - owl_global_get_starttime(&g));
-  g_free(tmpbuff);
+  fprintf(file, "[%d -  %.24s - %lds]: ",
+          (int) getpid(), ctime(&now), now - owl_global_get_starttime(&g));
   vfprintf(file, fmt, ap);
   putc('\n', file);
@@ -1764 +1761 @@
 void owl_function_status(void)
 {
-  char *tmpbuff;
   char buff[MAXPATHLEN+1];
   time_t start;
@@ -1792 +1788 @@
   owl_fmtext_append_normal(&fm, "\n");
 
-  tmpbuff = owl_util_time_to_timestr(localtime(&start));
-  owl_fmtext_appendf_normal(&fm, "  Startup Time: %s\n", tmpbuff);
-  g_free(tmpbuff);
+  owl_fmtext_appendf_normal(&fm, "  Startup Time: %s", ctime(&start));
 
   up=owl_global_get_runtime(&g);
@@ -3415 +3409 @@
   char *buff;
 
-  now = time(NULL);
-  date = owl_util_time_to_timestr(localtime(&now));
+  now=time(NULL);
+  date=g_strdup(ctime(&now));
+  date[strlen(date)-1]='\0';
 
   buff = g_strdup_printf("%s %s", date, string);

message.c

@@ -46 +46 @@
   
   /* save the time */
-  m->time = time(NULL);
-  m->timestr = owl_util_time_to_timestr(localtime(&m->time));
+  m->time=time(NULL);
+  m->timestr=g_strdup(ctime(&(m->time)));
+  m->timestr[strlen(m->timestr)-1]='\0';
 
   m->fmtext = NULL;
@@ -795 +796 @@
   /* save the time, we need to nuke the string saved by message_init */
   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->time=n->z_time.tv_sec;
+  m->timestr=g_strdup(ctime(&(m->time)));
+  m->timestr[strlen(m->timestr)-1]='\0';
 
   /* set other info */

perl/modules/Twitter/lib/BarnOwl/Module/Twitter/Handle.pm

@@ -29 +29 @@
 use BarnOwl;
 use BarnOwl::Message::Twitter;
-use POSIX qw(strftime);
+use POSIX qw(asctime);
 
 use LWP::UserAgent;
@@ -247 +247 @@
                        ($self->{cfg}->{account_nickname} ?
                         "[$self->{cfg}->{account_nickname}]" : "") .
-                        ": ratelimited until " . strftime('%c', localtime($timeout)));
+                        ": ratelimited until " . asctime(localtime($timeout)));
     } elsif(exists($ratelimit->{error})) {
         $self->sleep(60*20);

util.c

@@ -296 +296 @@
 }
 
-CALLER_OWN char *owl_util_time_to_timestr(const struct tm *time)
-{
-  /* 32 chosen for first attempt because timestr will end up being
-   * something like "Www Mmm dd hh:mm:ss AM yyyy UTC\0" */ 
-  size_t timestr_size = 16;
-  char *timestr = NULL;
-  do {
-    timestr_size *= 2;
-    timestr = g_realloc(timestr, sizeof(char) * timestr_size);
-  } while (strftime(timestr, timestr_size, "%c", time) == 0);
-  return timestr;
-}
-
 /* These are in order of their value in owl.h */
 static const struct {