--- deliantra/server/common/shstr.C 2008/07/29 02:00:55 1.31 +++ deliantra/server/common/shstr.C 2008/12/31 17:35:37 1.32 @@ -42,8 +42,8 @@ { int len = strlen (s); - shstr_alloc += sizeof (int) * 2 + len + 1; - const char *v = (const char *) (2 + (int *)g_slice_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 (unsigned int) * 2 + len + 1)); shstr::length (v) = len; shstr::refcnt (v) = 1; @@ -57,11 +57,12 @@ 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) @@ -127,8 +128,8 @@ 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; - g_slice_free1 (sizeof (int) * 2 + length (s) + 1, -2 + (int *) s); + shstr_alloc -= sizeof (unsigned int) * 2 + length (s) + 1; + g_slice_free1 (sizeof (unsigned int) * 2 + length (s) + 1, -2 + (int *) s); } else ++i;