From 6147684cf4273bec1c30dccf489d0e96ec462d12 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jaakko=20Ker=C3=A4nen?= Date: Fri, 28 Mar 2014 09:03:14 +0200 Subject: [PATCH] Cleanup|libcommon: Accessing pointer-based byte arrays de::ByteRefArray is the appropriate array class to use for referencing an existing pointer-based array of bytes with a known size. --- doomsday/plugins/common/src/p_saveio.cpp | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/doomsday/plugins/common/src/p_saveio.cpp b/doomsday/plugins/common/src/p_saveio.cpp index 89aa48fabb..08b55c9a32 100644 --- a/doomsday/plugins/common/src/p_saveio.cpp +++ b/doomsday/plugins/common/src/p_saveio.cpp @@ -23,6 +23,7 @@ #include #include +#include // Used during write: static de::Writer *writer; @@ -74,10 +75,9 @@ static void srd(reader_s *r, char *data, int len) if(!r) return; DENG2_ASSERT(reader); if(data) - { - de::Block tmp(len); - *reader >> de::FixedByteArray(tmp); - tmp.get(0, (de::Block::Byte *)data, len); + { + de::ByteRefArray ref(data, len); + reader->readPresetSize(ref); } else { @@ -158,8 +158,7 @@ static void swd(Writer *w, char const *data, int len) DENG2_ASSERT(writer); if(data) { - de::Block tmp(data, len); - *writer << de::FixedByteArray(tmp); + writer->writePresetSize(de::ByteRefArray(data, len)); } }