tizen 2.4 release

[framework/web/wrt-commons.git] / modules / core / src / file_output.cpp

diff --git a/modules_mobile/core/src/file_output.cpp b/modules/core/src/file_output.cpp
similarity index 86%
rename from modules_mobile/core/src/file_output.cpp
rename to modules/core/src/file_output.cpp
index 8342698..df56023 100644 (file)
--- a/modules_mobile/core/src/file_output.cpp
+++ b/modules/core/src/file_output.cpp
@@ -22,8 +22,9 @@
 #include <stddef.h>
 #include <dpl/file_output.h>
 #include <dpl/binary_queue.h>
-#include <dpl/scoped_free.h>
-#include <dpl/log/log.h>
+#include <dpl/free_deleter.h>
+#include <memory>
+#include <dpl/log/wrt_log.h>
 #include <unistd.h>
 #include <sys/stat.h>
 #include <fcntl.h>
@@ -64,7 +65,7 @@ void FileOutput::Open(const std::string& fileName)
     // Save new descriptor
     m_fd = fd;
 
-    LogPedantic("Opened file: " << fileName);
+    WrtLogD("Opened file: %s", fileName.c_str());
 }
 
 void FileOutput::Close()
@@ -79,7 +80,7 @@ void FileOutput::Close()
 
     m_fd = -1;
 
-    LogPedantic("Closed file");
+    WrtLogD("Closed file");
 }
 
 size_t FileOutput::Write(const BinaryQueue &buffer, size_t bufferSize)
@@ -92,14 +93,14 @@ size_t FileOutput::Write(const BinaryQueue &buffer, size_t bufferSize)
     // FIXME: User write visitor to write !
     // WriteVisitor visitor
 
-    ScopedFree<void> flattened(malloc(bufferSize));
-    buffer.Flatten(flattened.Get(), bufferSize);
+    std::unique_ptr<void,free_deleter> flattened(malloc(bufferSize));
+    buffer.Flatten(flattened.get(), bufferSize);
 
-    LogPedantic("Trying to write " << bufferSize << " bytes");
+    WrtLogD("Trying to write %u bytes", bufferSize);
 
-    ssize_t result = TEMP_FAILURE_RETRY(write(m_fd, flattened.Get(), bufferSize));
+    ssize_t result = TEMP_FAILURE_RETRY(write(m_fd, flattened.get(), bufferSize));
 
-    LogPedantic("Wrote " << result << " bytes to file");
+    WrtLogD("Wrote %u bytes to file", result);
 
     if (result > 0) {
         // Successfuly written some bytes