projects
/
framework
/
web
/
wrt-commons.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
tizen 2.4 release
[framework/web/wrt-commons.git]
/
modules
/
core
/
src
/
file_input.cpp
diff --git
a/modules_mobile/core/src/file_input.cpp
b/modules/core/src/file_input.cpp
similarity index 93%
rename from
modules_mobile/core/src/file_input.cpp
rename to
modules/core/src/file_input.cpp
index
36fb4b5
..
dc66a04
100644
(file)
--- a/
modules_mobile/core/src/file_input.cpp
+++ b/
modules/core/src/file_input.cpp
@@
-22,7
+22,7
@@
#include <stddef.h>
#include <dpl/file_input.h>
#include <dpl/binary_queue.h>
#include <stddef.h>
#include <dpl/file_input.h>
#include <dpl/binary_queue.h>
-#include <dpl/log/log.h>
+#include <dpl/log/
wrt_
log.h>
#include <unistd.h>
#include <sys/stat.h>
#include <fcntl.h>
#include <unistd.h>
#include <sys/stat.h>
#include <fcntl.h>
@@
-65,7
+65,7
@@
void FileInput::Open(const std::string& fileName)
// Save new descriptor
m_fd = fd;
// Save new descriptor
m_fd = fd;
-
LogPedantic("Opened file: " << fileName
);
+
WrtLogD("Opened file: %s", fileName.c_str()
);
}
void FileInput::Close()
}
void FileInput::Close()
@@
-80,7
+80,7
@@
void FileInput::Close()
m_fd = -1;
m_fd = -1;
-
LogPedantic
("Closed file");
+
WrtLogD
("Closed file");
}
BinaryQueueAutoPtr FileInput::Read(size_t size)
}
BinaryQueueAutoPtr FileInput::Read(size_t size)
@@
-96,11
+96,11
@@
BinaryQueueAutoPtr FileInput::Read(size_t size)
throw std::bad_alloc();
}
throw std::bad_alloc();
}
-
LogPedantic("Trying to read " << bytesToRead << " bytes"
);
+
WrtLogD("Trying to read %u bytes", bytesToRead
);
ssize_t result = TEMP_FAILURE_RETRY(read(m_fd, buffer, bytesToRead));
ssize_t result = TEMP_FAILURE_RETRY(read(m_fd, buffer, bytesToRead));
-
LogPedantic("Read " << result << " bytes from file"
);
+
WrtLogD("Read %u bytes from file", result
);
if (result > 0) {
// Succedded to read socket data
if (result > 0) {
// Succedded to read socket data