diff options
| author | SmallJoker <mk939@ymail.com> | 2020-09-20 13:12:55 +0200 |
|---|---|---|
| committer | Loïc Blot <nerzhul@users.noreply.github.com> | 2020-10-01 09:52:59 +0200 |
| commit | 947466ab28129fd69e6630974c6c4e901f2bebc6 (patch) | |
| tree | 720b35a5f8c01e42a5078f7fb79d612d1a1484d9 /src/nodemetadata.cpp | |
| parent | ca5c2dbefab3676514e48b445b36de50993de9f1 (diff) | |
| download | minetest-947466ab28129fd69e6630974c6c4e901f2bebc6.tar.gz minetest-947466ab28129fd69e6630974c6c4e901f2bebc6.tar.bz2 minetest-947466ab28129fd69e6630974c6c4e901f2bebc6.zip | |
(se)SerializeString: Include max length in the name
This commit clarifies the maximal length of the serialized strings.
It will avoid accidental use of serializeString() when a larger string can be expected.
Removes unused Wide String serialization functions
Diffstat (limited to 'src/nodemetadata.cpp')
| -rw-r--r-- | src/nodemetadata.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/nodemetadata.cpp b/src/nodemetadata.cpp index b84ffc8cb..6447c8785 100644 --- a/src/nodemetadata.cpp +++ b/src/nodemetadata.cpp @@ -49,8 +49,8 @@ void NodeMetadata::serialize(std::ostream &os, u8 version, bool disk) const if (!disk && priv) continue; - os << serializeString(sv.first); - os << serializeLongString(sv.second); + os << serializeString16(sv.first); + os << serializeString32(sv.second); if (version >= 2) writeU8(os, (priv) ? 1 : 0); } @@ -63,8 +63,8 @@ void NodeMetadata::deSerialize(std::istream &is, u8 version) clear(); int num_vars = readU32(is); for(int i=0; i<num_vars; i++){ - std::string name = deSerializeString(is); - std::string var = deSerializeLongString(is); + std::string name = deSerializeString16(is); + std::string var = deSerializeString32(is); m_stringvars[name] = var; if (version >= 2) { if (readU8(is) == 1) |