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.21 by root, Mon Apr 16 15:41:26 2007 UTC vs.
Revision 1.22 by root, Thu May 17 21:32:08 2007 UTC

1/*
2 * CrossFire, A Multiplayer game
3 *
4 * Copyright (C) 2005, 2006, 2007 Marc Lehmann & Crossfire+ Development Team
5 *
6 * This program 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 2 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, write to the Free Software
18 * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
19 *
20 * The authors can be reached via e-mail at <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;
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