--- deliantra/server/common/shstr.C 2006/09/12 00:53:56 1.16
+++ deliantra/server/common/shstr.C 2007/07/01 05:00:18 1.24
@@ -1,3 +1,23 @@
+/*
+ * This file is part of Crossfire TRT, the Roguelike Realtime MORPG.
+ *
+ * Copyright (©) 2005,2006,2007 Marc Alexander Lehmann / Robin Redeker / the Crossfire TRT team
+ *
+ * Crossfire TRT is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see .
+ *
+ * The authors can be reached via e-mail to
+ */
/*
* shstr.C
@@ -5,25 +25,21 @@
#include
#include
-
#include
-
#include
#include "global.h"
-typedef std::tr1::unordered_set HT;
+typedef std::tr1::unordered_set , true> HT;
static HT ht;
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;
@@ -33,7 +49,15 @@
return v;
}
-const char *shstr::null = makevec ("");
+static const char *
+makenull ()
+{
+ const char *s = makevec ("(null)");
+ shstr::length (s) = 0;
+ return s;
+}
+
+const char *shstr::null = makenull ();
const char *
shstr::find (const char *s)
@@ -41,7 +65,7 @@
if (!s)
return s;
- HT::iterator i = ht.find (s);
+ auto (i, ht.find (s));
return i != ht.end ()? *i : 0;
}
@@ -68,12 +92,9 @@
void
shstr::gc ()
{
-return; //D
-//D currently disabled: some datastructures might still store them
-//D but their pointers will become invalidated
static const char *curpos;
- HT::iterator i = curpos ? ht.find (curpos) : ht.begin ();
+ auto (i, curpos ? ht.find (curpos) : ht.begin ());
if (i == ht.end ())
i = ht.begin ();
@@ -92,7 +113,7 @@
break;
else if (!refcnt (*i))
{
- HT::iterator o = i++;
+ auto (o, i++);
const char *s = *o;
ht.erase (o);
@@ -117,7 +138,6 @@
/* buf_overflow() - we don't want to exceed the buffer size of
* buf1 by adding on buf2! Returns true if overflow will occur.
*/
-
int
buf_overflow (const char *buf1, const char *buf2, int bufsize)
{
@@ -129,5 +149,6 @@
len2 = strlen (buf2);
if ((len1 + len2) >= bufsize)
return 1;
+
return 0;
}