--- deliantra/server/common/shstr.C	2006/09/07 07:52:58	1.12
+++ deliantra/server/common/shstr.C	2006/09/10 16:00:23	1.13
@@ -1,3 +1,4 @@
+
 /*
  * shstr.C
  */
@@ -12,25 +13,34 @@
 #include "shstr.h"
 #include "util.h"
 
-typedef std::tr1::unordered_set<const char *, str_hash, str_equal> HT;
+typedef
+std::tr1::unordered_set < const char *,
+  str_hash,
+  str_equal >
+  HT;
 
-static HT ht;
+static HT
+  ht;
 
-static const char *makevec (const char *s)
+static const char *
+makevec (const char *s)
 {
-  int len = strlen (s);
+  int
+    len = strlen (s);
 
-  const char *v = (const char *)(2 + (int *)g_slice_alloc (sizeof (int) * 2 + len + 1));
+  const char *
+    v = (const char *) (2 + (int *) g_slice_alloc (sizeof (int) * 2 + len + 1));
 
   shstr::length (v) = len;
   shstr::refcnt (v) = 1;
 
-  memcpy ((char *)v, s, len + 1);
+  memcpy ((char *) v, s, len + 1);
 
   return v;
 }
 
-const char *shstr::null = makevec ("<nil>");
+const char *
+  shstr::null = makevec ("<nil>");
 
 // what weird misoptimisation is this again?
 const shstr undead_name ("undead");
@@ -43,9 +53,7 @@
 
   HT::iterator i = ht.find (s);
 
-  return i != ht.end ()
-    ? *i
-    : 0;
+  return i != ht.end ()? *i : 0;
 }
 
 const char *
@@ -93,10 +101,11 @@
         {
           HT::iterator o = i++;
           const char *s = *o;
+
           ht.erase (o);
 
           //printf ("GC %4d %3d %d >%s<%d\n", (int)ht.size (), n, shstr::refcnt (s), s, shstr::length (s));
-          g_slice_free1 (sizeof (int) * 2 + length (s) + 1, -2 + (int *)s);
+          g_slice_free1 (sizeof (int) * 2 + length (s) + 1, -2 + (int *) s);
         }
       else
         ++i;
@@ -106,21 +115,21 @@
 }
 
 //TODO: this should of course not be here
+
 /* buf_overflow() - we don't want to exceed the buffer size of 
  * buf1 by adding on buf2! Returns true if overflow will occur.
  */
 
-int 
+int
 buf_overflow (const char *buf1, const char *buf2, int bufsize)
 {
-    int len1 = 0, len2 = 0;
+  int len1 = 0, len2 = 0;
 
-    if (buf1)
-        len1 = strlen (buf1);
-    if (buf2)
-        len2 = strlen (buf2);
-    if ((len1 + len2) >= bufsize)
-        return 1;
-    return 0;
+  if (buf1)
+    len1 = strlen (buf1);
+  if (buf2)
+    len2 = strlen (buf2);
+  if ((len1 + len2) >= bufsize)
+    return 1;
+  return 0;
 }
-