--- deliantra/server/include/cfperl.h 2007/05/27 23:14:37 1.67 +++ deliantra/server/include/cfperl.h 2007/05/28 21:15:56 1.74 @@ -1,3 +1,27 @@ +/* + * This file is part of Crossfire TRT, the Multiplayer Online Role Playing Game. + * + * Copyright (©) 2005,2006,2007 Marc Alexander Lehmann / Robin Redeker / the Crossfire TRT team + * Copyright (©) 2002,2007 Mark Wedel & Crossfire Development Team + * Copyright (©) 1992,2007 Frank Tore Johansen + * + * Crossfire TRT 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 2 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 Crossfire TRT; if not, write to the Free Software Foundation, Inc. 51 + * Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + * + * The authors can be reached via e-mail to + */ + // // cfperl.h perl interface // @@ -240,15 +264,6 @@ add ('\n'); } - //TODO//temporary, used only for saving body locations - void put (const char *k, int v) - { - add (k); - add (' '); - add (sint32 (v)); - add ('\n'); - } - template void put_string (keyword k, const T &v) { @@ -280,40 +295,29 @@ void put (keyword k, double v) { - char buf [128]; - - snprintf (buf, 128, "%.7g", v); - - put (k, (const char *)buf); + force (MAX_KEYWORD_LEN + 2 + 32); + fadd (keyword_str [k], keyword_len [k]); + fadd (' '); + falloc (sprintf (ptr, "%.7g", v)); + fadd ('\n'); } void put_(keyword k, sint64 v) { - add (keyword_str [k], keyword_len [k]); - add (' '); + force (MAX_KEYWORD_LEN + 2 + sint64_digits); + fadd (keyword_str [k], keyword_len [k]); + fadd (' '); add (v); - add ('\n'); + fadd ('\n'); } void put_(keyword k, sint32 v) { - add (keyword_str [k], keyword_len [k]); - add (' '); + force (MAX_KEYWORD_LEN + 2 + sint32_digits); + fadd (keyword_str [k], keyword_len [k]); + fadd (' '); add (v); - add ('\n'); - } - - void put (keyword kbeg, keyword kend, const shstr &v) - { - add (keyword_str [kbeg], keyword_len [kbeg]); add ('\n'); - - if (expect_true (v)) - { - add (v); - add ('\n'); - } - - add (keyword_str [kend], keyword_len [kend]); add ('\n'); + fadd ('\n'); } void put (keyword k, float v) { put (k, (double)v); } @@ -328,10 +332,25 @@ void put (keyword k, signed long long v) { put_(k, (sint64)v); } void put (keyword k, unsigned long long v) { put_(k, (sint64)v); } + void put (keyword kbeg, keyword kend, const shstr &v) + { + force (MAX_KEYWORD_LEN + 1); + fadd (keyword_str [kbeg], keyword_len [kbeg]); fadd ('\n'); + + if (expect_true (v)) + { + add (v); + add ('\n'); + } + + force (MAX_KEYWORD_LEN + 1); + fadd (keyword_str [kend], keyword_len [kend]); fadd ('\n'); + } + template void put (keyword k, const T *v) { - if (expect_true (v)) + if (v) put (k, v->name); else put (k, (const char *)0); @@ -372,16 +391,9 @@ // parse next line void next (); // skip the current key-value (usually fetch next line, for - // multiline-fields, skips untilt he corresponding end-kw + // multiline-fields, skips till the corresponding end-kw void skip (); - //TODO: remove, deprecated - keyword get_kv () - { - next (); - return kw; - } - char *get_str () { return value; } // may be 0 void get_ml (keyword kend, shstr &sh); @@ -390,8 +402,8 @@ bool get_bool () const { return *value_nn == '1'; } sint32 get_sint32 () const; - sint64 get_sint64 () const { return atoll (value_nn); } - double get_double () const { return atof (value_nn); } + sint64 get_sint64 () const { return strtoll (value_nn, 0, 10); } + double get_double () const { return strtod (value_nn, 0); } void get (float &v) { v = get_double (); } void get (double &v) { v = get_double (); }