Skip to content

Commit 26a6716

Browse files
committed
Cosmetic changes
1 parent 49e3ff0 commit 26a6716

File tree

3 files changed

+4
-6
lines changed

3 files changed

+4
-6
lines changed

src/Event.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,7 @@ std::string Event::toString() const
7171
else
7272
ss << std::setw(16) << std::hex << getHash() << "\"";
7373

74-
ss << std::dec;
74+
ss << std::dec;
7575
}
7676

7777
if (getType() == BLOCK_INFO) {

src/app/BlockCompressor.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -142,15 +142,15 @@ BlockCompressor::BlockCompressor(const Context& ctx) :
142142

143143
if (bl < MIN_BLOCK_SIZE) {
144144
stringstream sserr;
145-
sserr << "Minimum block size is " << (MIN_BLOCK_SIZE / 1024) << " KB (";
145+
sserr << "Minimum block size is " << (MIN_BLOCK_SIZE / 1024) << " KiB (";
146146
sserr << MIN_BLOCK_SIZE << " bytes), got " << bl;
147147
sserr << (bl > 1 ? " bytes" : " byte");
148148
throw invalid_argument(sserr.str().c_str());
149149
}
150150

151151
if (bl > MAX_BLOCK_SIZE) {
152152
stringstream sserr;
153-
sserr << "Maximum block size is " << (MAX_BLOCK_SIZE / (1024 * 1024 * 1024)) << " GB (";
153+
sserr << "Maximum block size is " << (MAX_BLOCK_SIZE / (1024 * 1024 * 1024)) << " GiB (";
154154
sserr << MAX_BLOCK_SIZE << " bytes), got " << bl << " bytes";
155155
throw invalid_argument(sserr.str().c_str());
156156
}

src/io/CompressedInputStream.cpp

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -352,10 +352,8 @@ void CompressedInputStream::readHeader()
352352
// Read & verify checksum
353353
const int crcSize = bsVersion <= 5 ? 16 : 24;
354354
const uint32 cksum1 = uint32(_ibs->readBits(crcSize));
355-
356355
uint32 seed = (bsVersion >= 6 ? 0x01030507 : 1) * uint32(bsVersion);
357356
const uint32 HASH = 0x1E35A7BD;
358-
359357
uint32 cksum2 = HASH * seed;
360358

361359
if (bsVersion >= 6)
@@ -401,7 +399,7 @@ void CompressedInputStream::readHeader()
401399
// Protect against future concurrent modification of the list of block listeners
402400
vector<Listener<Event>*> blockListeners(_listeners);
403401
Event evt(Event::AFTER_HEADER_DECODING, 0, ss.str(), clock());
404-
CompressedInputStream::notifyListeners(blockListeners, evt);
402+
notifyListeners(blockListeners, evt);
405403
}
406404
}
407405

0 commit comments

Comments
 (0)