--- deliantra/server/common/shstr.C 2009/01/01 21:15:12 1.38
+++ deliantra/server/common/shstr.C 2009/11/04 00:02:48 1.40
@@ -3,18 +3,19 @@
*
* Copyright (©) 2005,2006,2007,2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team
*
- * Deliantra is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
+ * Deliantra is free software: you can redistribute it and/or modify it under
+ * the terms of the Affero GNU General Public License as published by the
+ * Free Software Foundation, either version 3 of the License, or (at your
+ * option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see .
+ * You should have received a copy of the Affero GNU General Public License
+ * and the GNU General Public License along with this program. If not, see
+ * .
*
* The authors can be reached via e-mail to
*/
@@ -141,24 +142,3 @@
shstr skill_names[NUM_SKILLS];
-//TODO: this should of course not be here
-
-/* buf_overflow() - we don't want to exceed the buffer size of
- * buf1 by adding on buf2! Returns true if overflow will occur.
- */
-int
-buf_overflow (const char *buf1, const char *buf2, int bufsize)
-{
- int len1 = 0, len2 = 0;
-
- if (buf1)
- len1 = strlen (buf1);
-
- if (buf2)
- len2 = strlen (buf2);
-
- if ((len1 + len2) >= bufsize)
- return 1;
-
- return 0;
-}