wornvirtue
/
premiere-libtorrent
forked from premiere/premiere-libtorrent
1
0
Fork 0
Code Pull Requests Activity

minor refactor, compilation fix when DEBUG_DISK_THREAD and missing convert_to_native (#1256)

This commit is contained in:
Alden Torres 2016-10-25 20:46:23 -04:00 committed by Arvid Norberg
parent 675d16a2c3
commit 4eebd0c68a
2 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/disk_io_thread.cpp
View File

@ -61,6 +61,7 @@ POSSIBILITY OF SUCH DAMAGE.
#if DEBUG_DISK_THREAD #if DEBUG_DISK_THREAD
#include <cstdarg> #include <cstdarg>
#include <sstream>
#define DLOG(...) debug_log(__VA_ARGS__) #define DLOG(...) debug_log(__VA_ARGS__)
#else #else
#define DLOG(...) do {} while(false) #define DLOG(...) do {} while(false)
@ -1762,7 +1763,7 @@ namespace libtorrent
if (pe && !pe->hashing && pe->hash && pe->hash->offset == piece_size) if (pe && !pe->hashing && pe->hash && pe->hash->offset == piece_size)
{ {
sha1_hash result = pe->hash->h.final(); sha1_hash result = pe->hash->h.final();
memcpy(j->d.piece_hash, &result[0], 20); std::memcpy(j->d.piece_hash, result.data(), 20);
pe->hash.reset(); pe->hash.reset();
@ -2232,7 +2233,7 @@ namespace libtorrent
TORRENT_PIECE_ASSERT(pe->cache_state <= cached_piece_entry::read_lru1 || pe->cache_state == cached_piece_entry::read_lru2, pe); TORRENT_PIECE_ASSERT(pe->cache_state <= cached_piece_entry::read_lru1 || pe->cache_state == cached_piece_entry::read_lru2, pe);
// are we already done hashing? // are we already done hashing?
if (pe->hash != nullptr && !pe->hashing && pe->hash->offset == piece_size) if (pe->hash && !pe->hashing && pe->hash->offset == piece_size)
{ {
DLOG("do_hash: (%d) (already done)\n", int(pe->piece)); DLOG("do_hash: (%d) (already done)\n", int(pe->piece));
sha1_hash piece_hash = pe->hash->h.final(); sha1_hash piece_hash = pe->hash->h.final();

4
src/file.cpp
View File

@ -1488,7 +1488,7 @@ namespace libtorrent
| ((mode & no_atime) ? O_NOATIME : 0) | ((mode & no_atime) ? O_NOATIME : 0)
#endif #endif
#ifdef O_SYNC #ifdef O_SYNC
| ((mode & no_cache) ? O_SYNC: 0) | ((mode & no_cache) ? O_SYNC : 0)
#endif #endif
; ;
@ -1504,7 +1504,7 @@ namespace libtorrent
{ {
mode &= ~no_atime; mode &= ~no_atime;
open_mode &= ~O_NOATIME; open_mode &= ~O_NOATIME;
handle = ::open(path.c_str(), mode_array[mode & rw_mask] | open_mode handle = ::open(convert_to_native(path).c_str(), mode_array[mode & rw_mask] | open_mode
, permissions); , permissions);
} }
#endif #endif