ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/deliantra/server/common/shstr.C
(Generate patch)

Comparing deliantra/server/common/shstr.C (file contents):
Revision 1.20 by root, Thu Sep 14 18:13:01 2006 UTC vs.
Revision 1.24 by root, Sun Jul 1 05:00:18 2007 UTC

1/*
2 * This file is part of Crossfire TRT, the Roguelike Realtime MORPG.
3 *
4 * Copyright (©) 2005,2006,2007 Marc Alexander Lehmann / Robin Redeker / the Crossfire TRT team
5 *
6 * Crossfire TRT is free software: you can redistribute it and/or modify
7 * it under the terms of the GNU General Public License as published by
8 * the Free Software Foundation, either version 3 of the License, or
9 * (at your option) any later version.
10 *
11 * This program is distributed in the hope that it will be useful,
12 * but WITHOUT ANY WARRANTY; without even the implied warranty of
13 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
14 * GNU General Public License for more details.
15 *
16 * You should have received a copy of the GNU General Public License
17 * along with this program. If not, see <http://www.gnu.org/licenses/>.
18 *
19 * The authors can be reached via e-mail to <crossfire@schmorp.de>
20 */
21
1/* 22/*
2 * shstr.C 23 * shstr.C
3 */ 24 */
4 25
5#include <cstring> 26#include <cstring>
6#include <cstdlib> 27#include <cstdlib>
7
8#include <glib.h> 28#include <glib.h>
9
10#include <tr1/unordered_set> 29#include <tr1/unordered_set>
11 30
12#include "global.h" 31#include "global.h"
13 32
14typedef std::tr1::unordered_set <const char *, str_hash, str_equal, slice_allocator<const char *>, true> HT; 33typedef std::tr1::unordered_set <const char *, str_hash, str_equal, slice_allocator<const char *>, true> HT;
… …
44shstr::find (const char *s) 63shstr::find (const char *s)
45{ 64{
46 if (!s) 65 if (!s)
47 return s; 66 return s;
48 67
49 AUTODECL (i, ht.find (s)); 68 auto (i, ht.find (s));
50 69
51 return i != ht.end ()? *i : 0; 70 return i != ht.end ()? *i : 0;
52} 71}
53 72
54const char * 73const char *
… …
73void 92void
74shstr::gc () 93shstr::gc ()
75{ 94{
76 static const char *curpos; 95 static const char *curpos;
77 96
78 AUTODECL (i, curpos ? ht.find (curpos) : ht.begin ()); 97 auto (i, curpos ? ht.find (curpos) : ht.begin ());
79 98
80 if (i == ht.end ()) 99 if (i == ht.end ())
81 i = ht.begin (); 100 i = ht.begin ();
82 101
83 // go through all strings roughly once every 4 minutes 102 // go through all strings roughly once every 4 minutes
… …
92 } 111 }
93 else if (!--n) 112 else if (!--n)
94 break; 113 break;
95 else if (!refcnt (*i)) 114 else if (!refcnt (*i))
96 { 115 {
97 AUTODECL (o, i++); 116 auto (o, i++);
98 const char *s = *o; 117 const char *s = *o;
99 118
100 ht.erase (o); 119 ht.erase (o);
101 120
102 //printf ("GC %4d %3d %d >%s<%d\n", (int)ht.size (), n, shstr::refcnt (s), s, shstr::length (s)); 121 //printf ("GC %4d %3d %d >%s<%d\n", (int)ht.size (), n, shstr::refcnt (s), s, shstr::length (s));
… …
117//TODO: this should of course not be here 136//TODO: this should of course not be here
118 137
119/* buf_overflow() - we don't want to exceed the buffer size of 138/* buf_overflow() - we don't want to exceed the buffer size of
120 * buf1 by adding on buf2! Returns true if overflow will occur. 139 * buf1 by adding on buf2! Returns true if overflow will occur.
121 */ 140 */
122
123int 141int
124buf_overflow (const char *buf1, const char *buf2, int bufsize) 142buf_overflow (const char *buf1, const char *buf2, int bufsize)
125{ 143{
126 int len1 = 0, len2 = 0; 144 int len1 = 0, len2 = 0;
127 145
… …
129 len1 = strlen (buf1); 147 len1 = strlen (buf1);
130 if (buf2) 148 if (buf2)
131 len2 = strlen (buf2); 149 len2 = strlen (buf2);
132 if ((len1 + len2) >= bufsize) 150 if ((len1 + len2) >= bufsize)
133 return 1; 151 return 1;
152
134 return 0; 153 return 0;
135} 154}

Diff Legend

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