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.38 by root, Thu Jan 1 21:15:12 2009 UTC vs.
Revision 1.46 by root, Sat Apr 23 04:56:46 2011 UTC

1/* 1/*
2 * This file is part of Deliantra, the Roguelike Realtime MMORPG. 2 * This file is part of Deliantra, the Roguelike Realtime MMORPG.
3 * 3 *
4 * Copyright (©) 2005,2006,2007,2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team 4 * Copyright (©) 2005,2006,2007,2008,2009,2010,2011 Marc Alexander Lehmann / Robin Redeker / the Deliantra team
5 * 5 *
6 * Deliantra is free software: you can redistribute it and/or modify 6 * Deliantra is free software: you can redistribute it and/or modify it under
7 * it under the terms of the GNU General Public License as published by 7 * the terms of the Affero GNU General Public License as published by the
8 * the Free Software Foundation, either version 3 of the License, or 8 * Free Software Foundation, either version 3 of the License, or (at your
9 * (at your option) any later version. 9 * option) any later version.
10 * 10 *
11 * This program is distributed in the hope that it will be useful, 11 * This program is distributed in the hope that it will be useful,
12 * but WITHOUT ANY WARRANTY; without even the implied warranty of 12 * but WITHOUT ANY WARRANTY; without even the implied warranty of
13 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the 13 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
14 * GNU General Public License for more details. 14 * GNU General Public License for more details.
15 * 15 *
16 * You should have received a copy of the GNU General Public License 16 * You should have received a copy of the Affero GNU General Public License
17 * along with this program. If not, see <http://www.gnu.org/licenses/>. 17 * and the GNU General Public License along with this program. If not, see
18 * <http://www.gnu.org/licenses/>.
18 * 19 *
19 * The authors can be reached via e-mail to <support@deliantra.net> 20 * The authors can be reached via e-mail to <support@deliantra.net>
20 */ 21 */
21 22
22/* 23/*
… …
35typedef std::tr1::unordered_set <const char *, str_hash, str_equal, slice_allocator<const char *> > HT; 36typedef std::tr1::unordered_set <const char *, str_hash, str_equal, slice_allocator<const char *> > HT;
36 37
37static HT ht; 38static HT ht;
38static int next_gc; 39static int next_gc;
39 40
41#define NUM_INT 3
42
40static const char * 43static const char *
41makevec (const char *s) 44makevec (const char *s)
42{ 45{
43 int len = strlen (s); 46 int len = strlen (s);
44 int alloc = sizeof (uint32_t) * 2 + len + 1; 47 int alloc = sizeof (uint32_t) * NUM_INT + len + 1;
45 48
46 shstr_alloc += alloc; 49 shstr_alloc += alloc;
47 char *v = (char *)g_slice_alloc (alloc); 50 char *v = (char *)g_slice_alloc (alloc);
48 v += sizeof (uint32_t) * 2; 51 v += sizeof (uint32_t) * NUM_INT;
49 52
53 shstr::hash (v) = strhsh (s);
50 shstr::length (v) = len; 54 shstr::length (v) = len;
51 shstr::refcnt (v) = 1; 55 shstr::refcnt (v) = 1;
52 56
53 memcpy (v, s, len + 1); 57 memcpy (v, s, len + 1);
54 58
55 return v; 59 return v;
56} 60}
57 61
58shstr_vec<sizeof "(null)"> shstr_tmp::nullvec = { 0, 0xffffffff, "(null)" }; 62shstr_vec<sizeof "(null)"> shstr_tmp::nullvec = { STRHSH_NULL, 0, 0xffffffff, "(null)" };
63
64bool
65shstr_tmp::contains (const char *substring) const
66{
67 //TODO: this is supposed to check for comma-seperation...
68 return s != null ()
69 && substring
70 && strstr (s, substring);
71}
59 72
60const char * 73const char *
61shstr::find (const char *s) 74shstr::find (const char *s)
62{ 75{
63 if (!s) 76 if (!s)
… …
119 const char *s = *o; 132 const char *s = *o;
120 133
121 ht.erase (o); 134 ht.erase (o);
122 135
123 //printf ("GC %4d %3d %d >%s<%d\n", (int)ht.size (), n, shstr::refcnt (s), s, shstr::length (s)); 136 //printf ("GC %4d %3d %d >%s<%d\n", (int)ht.size (), n, shstr::refcnt (s), s, shstr::length (s));
124 int alloc = sizeof (uint32_t) * 2 + length (s) + 1; 137 int alloc = sizeof (uint32_t) * NUM_INT + length (s) + 1;
125 shstr_alloc -= alloc; 138 shstr_alloc -= alloc;
126 g_slice_free1 (alloc, (void *)(s - sizeof (uint32_t) * 2)); 139 g_slice_free1 (alloc, (void *)(s - sizeof (uint32_t) * NUM_INT));
127 } 140 }
128 else 141 else
129 ++i; 142 ++i;
130 } 143 }
131 144
… …
137#define def(id) def2(shstr_ ## id, # id) 150#define def(id) def2(shstr_ ## id, # id)
138# include "shstrinc.h" 151# include "shstrinc.h"
139#undef def 152#undef def
140#undef def2 153#undef def2
141 154
142shstr skill_names[NUM_SKILLS]; 155materialtype_t material_null;
143 156
144//TODO: this should of course not be here
145
146/* buf_overflow() - we don't want to exceed the buffer size of
147 * buf1 by adding on buf2! Returns true if overflow will occur.
148 */
149int
150buf_overflow (const char *buf1, const char *buf2, int bufsize)
151{
152 int len1 = 0, len2 = 0;
153
154 if (buf1)
155 len1 = strlen (buf1);
156
157 if (buf2)
158 len2 = strlen (buf2);
159
160 if ((len1 + len2) >= bufsize)
161 return 1;
162
163 return 0;
164}

Diff Legend

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