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 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 | /* |
… | |
… | |
39 | |
40 | |
40 | static const char * |
41 | static const char * |
41 | makevec (const char *s) |
42 | makevec (const char *s) |
42 | { |
43 | { |
43 | int len = strlen (s); |
44 | int len = strlen (s); |
|
|
45 | int alloc = sizeof (uint32_t) * 2 + len + 1; |
44 | |
46 | |
45 | shstr_alloc += sizeof (uint32_t) * 2 + len + 1; |
47 | shstr_alloc += alloc; |
46 | const char *v = (const char *) (2 + (int *)g_slice_alloc (sizeof (uint32_t) * 2 + len + 1)); |
48 | char *v = (char *)g_slice_alloc (alloc); |
|
|
49 | v += sizeof (uint32_t) * 2; |
47 | |
50 | |
48 | shstr::length (v) = len; |
51 | shstr::length (v) = len; |
49 | shstr::refcnt (v) = 1; |
52 | shstr::refcnt (v) = 1; |
50 | |
53 | |
51 | memcpy ((char *) v, s, len + 1); |
54 | memcpy (v, s, len + 1); |
52 | |
55 | |
53 | return v; |
56 | return v; |
54 | } |
57 | } |
55 | |
58 | |
56 | shstr_vec<sizeof "(null)"> shstr_tmp::nullvec = { 0, 0xffffffff, "(null)" }; |
59 | shstr_vec<sizeof "(null)"> shstr_tmp::nullvec = { 0, 0xffffffff, "(null)" }; |
… | |
… | |
117 | const char *s = *o; |
120 | const char *s = *o; |
118 | |
121 | |
119 | ht.erase (o); |
122 | ht.erase (o); |
120 | |
123 | |
121 | //printf ("GC %4d %3d %d >%s<%d\n", (int)ht.size (), n, shstr::refcnt (s), s, shstr::length (s)); |
124 | //printf ("GC %4d %3d %d >%s<%d\n", (int)ht.size (), n, shstr::refcnt (s), s, shstr::length (s)); |
122 | shstr_alloc -= sizeof (uint32_t) * 2 + length (s) + 1; |
125 | int alloc = sizeof (uint32_t) * 2 + length (s) + 1; |
123 | g_slice_free1 (sizeof (uint32_t) * 2 + length (s) + 1, -2 + (int *) s); |
126 | shstr_alloc -= alloc; |
|
|
127 | g_slice_free1 (alloc, (void *)(s - sizeof (uint32_t) * 2)); |
124 | } |
128 | } |
125 | else |
129 | else |
126 | ++i; |
130 | ++i; |
127 | } |
131 | } |
128 | |
132 | |
… | |
… | |
136 | #undef def |
140 | #undef def |
137 | #undef def2 |
141 | #undef def2 |
138 | |
142 | |
139 | shstr skill_names[NUM_SKILLS]; |
143 | shstr skill_names[NUM_SKILLS]; |
140 | |
144 | |
141 | //TODO: this should of course not be here |
|
|
142 | |
|
|
143 | /* buf_overflow() - we don't want to exceed the buffer size of |
|
|
144 | * buf1 by adding on buf2! Returns true if overflow will occur. |
|
|
145 | */ |
|
|
146 | int |
|
|
147 | buf_overflow (const char *buf1, const char *buf2, int bufsize) |
|
|
148 | { |
|
|
149 | int len1 = 0, len2 = 0; |
|
|
150 | |
|
|
151 | if (buf1) |
|
|
152 | len1 = strlen (buf1); |
|
|
153 | |
|
|
154 | if (buf2) |
|
|
155 | len2 = strlen (buf2); |
|
|
156 | |
|
|
157 | if ((len1 + len2) >= bufsize) |
|
|
158 | return 1; |
|
|
159 | |
|
|
160 | return 0; |
|
|
161 | } |
|
|