[ViewVC] Diff of: cvs/deliantra/server/common/shstr.C

Comparing deliantra/server/common/shstr.C (file contents):
Revision 1.31 by root, Tue Jul 29 02:00:55 2008 UTC vs.
Revision 1.32 by root, Wed Dec 31 17:35:37 2008 UTC

 static const char *
 makevec (const char *s)
 {
   int len = strlen (s);
-  shstr_alloc += sizeof (int) * 2 + len + 1;
+  shstr_alloc += sizeof (unsigned int) * 2 + len + 1;
-  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 (unsigned int) * 2 + len + 1));
   shstr::length (v) = len;
   shstr::refcnt (v) = 1;
   memcpy ((char *) v, s, len + 1);
 static const char *
 makenull ()
 {
   const char *s = makevec ("(null)");
-  shstr::length (s) = 0;
+  shstr_tmp::length (s) = 0;
+  //shstr    ::refcnt (s) = 0xffffffff; // useful for debugging
   return s;
 }
-const char *shstr::null = makenull ();
+const char *shstr_tmp::null = makenull ();
 const char *
 shstr::find (const char *s)
 {
   if (!s)
           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));
-          shstr_alloc -= sizeof (int) * 2 + length (s) + 1;
+          shstr_alloc -= sizeof (unsigned int) * 2 + length (s) + 1;
-          g_slice_free1 (sizeof (int) * 2 + length (s) + 1, -2 + (int *) s);
+          g_slice_free1 (sizeof (unsigned int) * 2 + length (s) + 1, -2 + (int *) s);
         }
       else
         ++i;
     }

-–
+Removed lines
-+
+Added lines
-<
+Changed lines
->
+Changed lines