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.23 by root, Mon May 28 21:21:40 2007 UTC

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

Diff Legend

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