# HG changeset patch
# User Mikael Berthe <mikael@lilotux.net>
# Date 1166120270 -3600
# Node ID 8e12137fab20443771902b6b5c7aa195d8916a3e
# Parent  265e1d873d3e45dbf189f6d0308ee5372b4f1e8a
Cosmetics and cleanup

diff -r 265e1d873d3e -r 8e12137fab20 mcabber/src/histolog.c
--- a/mcabber/src/histolog.c	Wed Dec 13 22:05:43 2006 +0100
+++ b/mcabber/src/histolog.c	Thu Dec 14 19:17:50 2006 +0100
@@ -46,16 +46,17 @@
 static char *user_histo_file(const char *bjid)
 {
   char *filename;
-  char *lowerid, *p;
-  if (!UseFileLogging && !FileLoadLogs) return NULL;
+  char *lowerid;
+
+  if (!(UseFileLogging || FileLoadLogs))
+    return NULL;
 
   lowerid = g_strdup(bjid);
-  for (p=lowerid; *p ; p++)
-    *p = tolower(*p);
+  if (!lowerid)
+    return NULL;
+  mc_strtolower(lowerid);
 
-  filename = g_new(char, strlen(RootDir) + strlen(bjid) + 1);
-  strcpy(filename, RootDir);
-  strcat(filename, lowerid);
+  filename = g_strdup_printf("%s%s", RootDir, lowerid);
   g_free(lowerid);
   return filename;
 }
@@ -73,7 +74,8 @@
   char str_ts[20];
   int err;
 
-  if (!UseFileLogging) return;
+  if (!UseFileLogging)
+    return;
 
   filename = user_histo_file(bjid);
 
@@ -134,7 +136,8 @@
   guint ln = 0; // line number
   time_t starttime;
 
-  if (!FileLoadLogs) return;
+  if (!FileLoadLogs)
+    return;
 
   if ((roster_gettype(bjid) & ROSTER_TYPE_ROOM) &&
       (settings_opt_get_int("load_muc_logs") != 1))
@@ -150,7 +153,10 @@
 
   fp = fopen(filename, "r");
   g_free(filename);
-  if (!fp) { g_free(data); return; }
+  if (!fp) {
+    g_free(data);
+    return;
+  }
 
   // If file is large (> 3MB here), display a message to inform the user
   // (it can take a while...)
@@ -159,20 +165,22 @@
       scr_LogPrint(LPRINT_LOGNORM, "Reading <%s> history file...", bjid);
   }
 
-  starttime = 0;
+  starttime = 0L;
   if (settings_opt_get_int("max_history_age") > 0) {
     int maxdays = settings_opt_get_int("max_history_age");
     time(&starttime);
-    if (maxdays >= starttime/86400)
-      starttime = 0;
+    if (maxdays >= starttime/86400L)
+      starttime = 0L;
     else
-      starttime -= maxdays * 86400;
+      starttime -= maxdays * 86400L;
   }
 
   /* See write_histo_line() for line format... */
   while (!feof(fp)) {
     guint dataoffset = 25;
-    if (fgets(data, HBB_BLOCKSIZE+27, fp) == NULL) break;
+
+    if (fgets(data, HBB_BLOCKSIZE+27, fp) == NULL)
+      break;
     ln++;
 
     for (tail = data; *tail; tail++) ;
@@ -230,7 +238,7 @@
     // Check if the data is older than max_history_age
     if (starttime) {
       if (timestamp > starttime)
-        starttime = 0; // From now on, load everything
+        starttime = 0L; // From now on, load everything
       else
         continue;
     }
@@ -275,28 +283,25 @@
       // RootDir must be slash-terminated
       if (root_dir[l-1] == '/')
         RootDir = g_strdup(root_dir);
-      else {
-        RootDir = g_new(char, l+2);
-        strcpy(RootDir, root_dir);
-        strcat(RootDir, "/");
-      }
+      else
+        RootDir = g_strdup_printf("%s/", root_dir);
     } else {
       char *home = getenv("HOME");
-      char *dir = "/.mcabber/histo/";
-      RootDir = g_new(char, strlen(home) + strlen(dir) + 1);
-      strcpy(RootDir, home);
-      strcat(RootDir, dir);
+      const char *dir = "/.mcabber/histo/";
+      RootDir = g_strdup_printf("%s%s", home, dir);
     }
     // Check directory permissions (should not be readable by group/others)
     if (checkset_perm(RootDir, TRUE) == -1) {
       // The directory does not actually exists
       g_free(RootDir);
+      RootDir = NULL;
       scr_LogPrint(LPRINT_LOGNORM, "ERROR: Cannot access "
                    "history log directory, logging DISABLED");
       UseFileLogging = FileLoadLogs = FALSE;
     }
   } else {  // Disable history logging
     g_free(RootDir);
+    RootDir = NULL;
   }
 }
 
diff -r 265e1d873d3e -r 8e12137fab20 mcabber/src/utils.c
--- a/mcabber/src/utils.c	Wed Dec 13 22:05:43 2006 +0100
+++ b/mcabber/src/utils.c	Thu Dec 14 19:17:50 2006 +0100
@@ -366,7 +366,7 @@
 }
 
 
-void mc_strtolower(char *str)
+inline void mc_strtolower(char *str)
 {
   if (!str) return;
   for ( ; *str; str++)
diff -r 265e1d873d3e -r 8e12137fab20 mcabber/src/utils.h
--- a/mcabber/src/utils.h	Wed Dec 13 22:05:43 2006 +0100
+++ b/mcabber/src/utils.h	Thu Dec 14 19:17:50 2006 +0100
@@ -28,7 +28,7 @@
 
 int check_jid_syntax(char *fjid);
 
-void mc_strtolower(char *str);
+inline void mc_strtolower(char *str);
 
 void strip_arg_special_chars(char *s);
 char **split_arg(const char *arg, unsigned int n, int dontstriplast);