Peerplays_Blockchain/peerplays-fc
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

FC Updates from BitShares and myself #21

Closed
nathanielhourt wants to merge 687 commits from dapp-support into latest-fc
pull from: dapp-support
merge into: Peerplays_Blockchain:latest-fc
Conversation 4 Commits 687 Files changed 314 +6 -10
1 changed files with 6 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files
Showing only changes of commit 84318f8d28 - Show all commits

16
src/io/fstream.cpp
View file

@ -68,17 +68,13 @@ namespace fc {
size_t ifstream::readsome( char* buf, size_t len ) { size_t ifstream::readsome( char* buf, size_t len ) {
auto s = size_t(my->ifs.readsome( buf, len )); auto s = size_t(my->ifs.readsome( buf, len ));
if( s <= 0 ) { if( s <= 0 )
try {
read( buf, 1 );
s = 1;
if (len > 1)
{ {
read( buf, len ); s += size_t(my->ifs.readsome( &buf[1], len - 1));
s = len;
}
catch (const fc::eof_exception& eof)
{
s = my->ifs.gcount();
if (s == 0)
throw eof;
} }
} }
return s; return s;