From 06b5596b2a9bf34b6e43004213f604d25fe2a353 Mon Sep 17 00:00:00 2001 From: Erik Zandvliet Date: Fri, 20 Dec 2013 13:07:38 +0100 Subject: [PATCH] Working DTSC Merge --- lib/dtsc.cpp | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/lib/dtsc.cpp b/lib/dtsc.cpp index bb35ff21..8a9951fe 100644 --- a/lib/dtsc.cpp +++ b/lib/dtsc.cpp @@ -476,16 +476,14 @@ DTSC::File::File(const File & rhs){ DTSC::File & DTSC::File::operator =(const File & rhs){ created = rhs.created; if (rhs.F){ - int tmpFd = fileno(rhs.F); - int newFd = dup(tmpFd); - F = fdopen( newFd, (created ? "w+b": "r+b")); + F = fdopen( dup(fileno(rhs.F)), (created ? "w+b": "r+b")); }else{ F = 0; } endPos = rhs.endPos; strbuffer = rhs.strbuffer; - jsonbuffer = rhs.jsonbuffer; - metadata = rhs.metadata; + metaStorage = rhs.metaStorage; + metadata = metaStorage; currtime = rhs.currtime; lastreadpos = rhs.lastreadpos; headerSize = rhs.headerSize;