github
/
aria2
mirror of https://github.com/aria2/aria2
1
0
Fork 0
Code Issues Releases Wiki Activity

Convert most 0/NULL pointers to nullptr 

Courtesy of llvm cpp11-migrate 3.3
pull/119/head
Nils Maier 2013-08-20 18:57:17 +02:00
parent 9da17424c6
commit d8f44ef4f6
87 changed files with 253 additions and 253 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/AbstractBtMessage.cc
View File

@ -45,11 +45,11 @@ AbstractBtMessage::AbstractBtMessage(uint8_t id, const char* name)
uploading_(false), uploading_(false),
cuid_(0), cuid_(0),
name_(name), name_(name),
pieceStorage_(0), pieceStorage_(nullptr),
dispatcher_(0), dispatcher_(nullptr),
messageFactory_(0), messageFactory_(nullptr),
requestFactory_(0), requestFactory_(nullptr),
peerConnection_(0), peerConnection_(nullptr),
metadataGetMode_(false) metadataGetMode_(false)
{} {}

8
src/AbstractDiskWriter.cc
View File

@ -64,7 +64,7 @@ AbstractDiskWriter::AbstractDiskWriter(const std::string& filename)
#endif // !__MINGW32__ #endif // !__MINGW32__
readOnly_(false), readOnly_(false),
enableMmap_(false), enableMmap_(false),
mapaddr_(0), mapaddr_(nullptr),
maplen_(0) maplen_(0)
{} {}
@ -155,7 +155,7 @@ void AbstractDiskWriter::closeFile()
} else { } else {
A2_LOG_INFO(fmt("Unmapping file %s succeeded", filename_.c_str())); A2_LOG_INFO(fmt("Unmapping file %s succeeded", filename_.c_str()));
} }
mapaddr_ = 0; mapaddr_ = nullptr;
maplen_ = 0; maplen_ = 0;
} }
#endif // HAVE_MMAP || defined __MINGW32__ #endif // HAVE_MMAP || defined __MINGW32__
@ -356,7 +356,7 @@ void AbstractDiskWriter::ensureMmapWrite(size_t len, int64_t offset)
A2_LOG_ERROR(fmt("Unmapping file %s failed: %s", A2_LOG_ERROR(fmt("Unmapping file %s failed: %s",
filename_.c_str(), fileStrerror(errNum).c_str())); filename_.c_str(), fileStrerror(errNum).c_str()));
} }
mapaddr_ = 0; mapaddr_ = nullptr;
maplen_ = 0; maplen_ = 0;
enableMmap_ = false; enableMmap_ = false;
} }
@ -381,7 +381,7 @@ void AbstractDiskWriter::ensureMmapWrite(size_t len, int64_t offset)
} }
#else // !__MINGW32__ #else // !__MINGW32__
mapaddr_ = reinterpret_cast<unsigned char*> mapaddr_ = reinterpret_cast<unsigned char*>
(mmap(0, size(), PROT_READ | PROT_WRITE, MAP_SHARED, fd_, 0)); (mmap(nullptr, size(), PROT_READ | PROT_WRITE, MAP_SHARED, fd_, 0));
if(!mapaddr_) { if(!mapaddr_) {
errNum = errno; errNum = errno;
} }

12
src/AppleTLSContext.cc
View File

@ -102,7 +102,7 @@ namespace {
std::string errToString(OSStatus err) std::string errToString(OSStatus err)
{ {
std::string rv = "Unkown error"; std::string rv = "Unkown error";
CFStringRef cerr = SecCopyErrorMessageString(err, 0); CFStringRef cerr = SecCopyErrorMessageString(err, nullptr);
if (cerr) { if (cerr) {
size_t len = CFStringGetLength(cerr) * 4; size_t len = CFStringGetLength(cerr) * 4;
char *buf = new char[len]; char *buf = new char[len];
@ -118,7 +118,7 @@ namespace {
bool checkIdentity(const SecIdentityRef id, const std::string& fingerPrint, bool checkIdentity(const SecIdentityRef id, const std::string& fingerPrint,
const std::vector<std::string> supported) const std::vector<std::string> supported)
{ {
SecCertificateRef ref = 0; SecCertificateRef ref = nullptr;
if (SecIdentityCopyCertificate(id, &ref) != errSecSuccess) { if (SecIdentityCopyCertificate(id, &ref) != errSecSuccess) {
A2_LOG_ERROR("Failed to get a certref!"); A2_LOG_ERROR("Failed to get a certref!");
return false; return false;
@ -155,7 +155,7 @@ AppleTLSContext::~AppleTLSContext()
{ {
if (credentials_) { if (credentials_) {
CFRelease(credentials_); CFRelease(credentials_);
credentials_ = 0; credentials_ = nullptr;
} }
} }
@ -198,7 +198,7 @@ bool AppleTLSContext::tryAsFingerprint(const std::string& fingerprint)
A2_LOG_DEBUG(fmt("Looking for cert with fingerprint %s", fp.c_str())); A2_LOG_DEBUG(fmt("Looking for cert with fingerprint %s", fp.c_str()));
// Build and run the KeyChain the query. // Build and run the KeyChain the query.
SecPolicyRef policy = SecPolicyCreateSSL(true, 0); SecPolicyRef policy = SecPolicyCreateSSL(true, nullptr);
if (!policy) { if (!policy) {
A2_LOG_ERROR("Failed to create SecPolicy"); A2_LOG_ERROR("Failed to create SecPolicy");
return false; return false;
@ -210,8 +210,8 @@ bool AppleTLSContext::tryAsFingerprint(const std::string& fingerprint)
policy, policy,
kSecMatchLimitAll kSecMatchLimitAll
}; };
CFDictionaryRef query = CFDictionaryCreate(0, query_keys, query_values, CFDictionaryRef query = CFDictionaryCreate(nullptr, query_keys, query_values,
4, 0, 0); 4, nullptr, nullptr);
if (!query) { if (!query) {
A2_LOG_ERROR("Failed to create identity query"); A2_LOG_ERROR("Failed to create identity query");
return false; return false;

2
src/AppleTLSContext.h
View File

@ -51,7 +51,7 @@ public:
AppleTLSContext(TLSSessionSide side) AppleTLSContext(TLSSessionSide side)
: side_(side), : side_(side),
verifyPeer_(true), verifyPeer_(true),
credentials_(0) credentials_(nullptr)
{} {}
virtual ~AppleTLSContext(); virtual ~AppleTLSContext();

8
src/AppleTLSSession.cc
View File

@ -295,7 +295,7 @@ TLSSession* TLSSession::make(TLSContext* ctx)
AppleTLSSession::AppleTLSSession(AppleTLSContext* ctx) AppleTLSSession::AppleTLSSession(AppleTLSContext* ctx)
: ctx_(ctx), : ctx_(ctx),
sslCtx_(0), sslCtx_(nullptr),
sockfd_(0), sockfd_(0),
state_(st_constructed), state_(st_constructed),
lastError_(noErr), lastError_(noErr),
@ -343,7 +343,7 @@ AppleTLSSession::AppleTLSSession(AppleTLSContext* ctx)
state_ = st_error; state_ = st_error;
return; return;
} }
CFArrayRef certs = CFArrayCreate(0, (const void**)&creds, 1, 0); CFArrayRef certs = CFArrayCreate(nullptr, (const void**)&creds, 1, nullptr);
if (!certs) { if (!certs) {
A2_LOG_ERROR("AppleTLS: Failed to setup credentials"); A2_LOG_ERROR("AppleTLS: Failed to setup credentials");
state_ = st_error; state_ = st_error;
@ -374,7 +374,7 @@ AppleTLSSession::~AppleTLSSession()
closeConnection(); closeConnection();
if (sslCtx_) { if (sslCtx_) {
SSLDisposeContext(sslCtx_); SSLDisposeContext(sslCtx_);
sslCtx_ = 0; sslCtx_ = nullptr;
} }
state_ = st_error; state_ = st_error;
} }
@ -448,7 +448,7 @@ ssize_t AppleTLSSession::writeData(const void* data, size_t len)
} }
size_t processed = 0; size_t processed = 0;
if (writeBuffered_) { if (writeBuffered_) {
lastError_ = SSLWrite(sslCtx_, 0, 0, &processed); lastError_ = SSLWrite(sslCtx_, nullptr, 0, &processed);
switch (lastError_) { switch (lastError_) {
case noErr: case noErr:
processed = writeBuffered_; processed = writeBuffered_;

10
src/AsyncNameResolver.cc
View File

@ -148,21 +148,21 @@ ares_addr_node* parseAsyncDNSServers(const std::string& serversOpt)
',', ',',
true /* doStrip */); true /* doStrip */);
ares_addr_node root; ares_addr_node root;
root.next = 0; root.next = nullptr;
ares_addr_node* tail = &root; ares_addr_node* tail = &root;
ares_addr_node* node = 0; ares_addr_node* node = nullptr;
for(std::vector<std::string>::const_iterator i = servers.begin(), for(std::vector<std::string>::const_iterator i = servers.begin(),
eoi = servers.end(); i != eoi; ++i) { eoi = servers.end(); i != eoi; ++i) {
if(node == 0) { if(node == nullptr) {
node = new ares_addr_node(); node = new ares_addr_node();
} }
size_t len = net::getBinAddr(&node->addr, (*i).c_str()); size_t len = net::getBinAddr(&node->addr, (*i).c_str());
if(len != 0) { if(len != 0) {
node->next = 0; node->next = nullptr;
node->family = (len == 4 ? AF_INET : AF_INET6); node->family = (len == 4 ? AF_INET : AF_INET6);
tail->next = node; tail->next = node;
tail = node; tail = node;
node = 0; node = nullptr;
} }
} }
if(node) { if(node) {

2
src/BencodeParser.cc
View File

@ -164,7 +164,7 @@ ssize_t BencodeParser::parseUpdate(const char* data, size_t size)
i = j; i = j;
currentState_ = BENCODE_STRING; currentState_ = BENCODE_STRING;
if(strLength_ == 0) { if(strLength_ == 0) {
runCharactersCallback(0, 0); runCharactersCallback(nullptr, 0);
onStringEnd(); onStringEnd();
} }
} else { } else {

12
src/BitfieldMan.cc
View File

@ -50,9 +50,9 @@ BitfieldMan::BitfieldMan(int32_t blockLength, int64_t totalLength)
bitfieldLength_(0), bitfieldLength_(0),
blocks_(0), blocks_(0),
filterEnabled_(false), filterEnabled_(false),
bitfield_(0), bitfield_(nullptr),
useBitfield_(0), useBitfield_(nullptr),
filterBitfield_(0), filterBitfield_(nullptr),
cachedNumMissingBlock_(0), cachedNumMissingBlock_(0),
cachedNumFilteredBlock_(0), cachedNumFilteredBlock_(0),
cachedCompletedLength_(0), cachedCompletedLength_(0),
@ -78,7 +78,7 @@ BitfieldMan::BitfieldMan(const BitfieldMan& bitfieldMan)
filterEnabled_(bitfieldMan.filterEnabled_), filterEnabled_(bitfieldMan.filterEnabled_),
bitfield_(new unsigned char[bitfieldLength_]), bitfield_(new unsigned char[bitfieldLength_]),
useBitfield_(new unsigned char[bitfieldLength_]), useBitfield_(new unsigned char[bitfieldLength_]),
filterBitfield_(0), filterBitfield_(nullptr),
cachedNumMissingBlock_(0), cachedNumMissingBlock_(0),
cachedNumFilteredBlock_(0), cachedNumFilteredBlock_(0),
cachedCompletedLength_(0), cachedCompletedLength_(0),
@ -116,7 +116,7 @@ BitfieldMan& BitfieldMan::operator=(const BitfieldMan& bitfieldMan)
filterBitfield_ = new unsigned char[bitfieldLength_]; filterBitfield_ = new unsigned char[bitfieldLength_];
memcpy(filterBitfield_, bitfieldMan.filterBitfield_, bitfieldLength_); memcpy(filterBitfield_, bitfieldMan.filterBitfield_, bitfieldLength_);
} else { } else {
filterBitfield_ = 0; filterBitfield_ = nullptr;
} }
updateCache(); updateCache();
@ -724,7 +724,7 @@ void BitfieldMan::disableFilter() {
void BitfieldMan::clearFilter() { void BitfieldMan::clearFilter() {
if(filterBitfield_) { if(filterBitfield_) {
delete [] filterBitfield_; delete [] filterBitfield_;
filterBitfield_ = 0; filterBitfield_ = nullptr;
} }
filterEnabled_ = false; filterEnabled_ = false;
updateCache(); updateCache();

4
src/BtBitfieldMessage.cc
View File

@ -49,14 +49,14 @@ namespace aria2 {
const char BtBitfieldMessage::NAME[] = "bitfield"; const char BtBitfieldMessage::NAME[] = "bitfield";
BtBitfieldMessage::BtBitfieldMessage():SimpleBtMessage(ID, NAME), BtBitfieldMessage::BtBitfieldMessage():SimpleBtMessage(ID, NAME),
bitfield_(0), bitfield_(nullptr),
bitfieldLength_(0) bitfieldLength_(0)
{} {}
BtBitfieldMessage::BtBitfieldMessage BtBitfieldMessage::BtBitfieldMessage
(const unsigned char* bitfield, size_t bitfieldLength): (const unsigned char* bitfield, size_t bitfieldLength):
SimpleBtMessage(ID, NAME), SimpleBtMessage(ID, NAME),
bitfield_(0), bitfield_(nullptr),
bitfieldLength_(0) bitfieldLength_(0)
{ {
setBitfield(bitfield, bitfieldLength); setBitfield(bitfield, bitfieldLength);

2
src/BtCheckIntegrityEntry.cc
View File

@ -44,7 +44,7 @@
namespace aria2 { namespace aria2 {
BtCheckIntegrityEntry::BtCheckIntegrityEntry(RequestGroup* requestGroup): BtCheckIntegrityEntry::BtCheckIntegrityEntry(RequestGroup* requestGroup):
PieceHashCheckIntegrityEntry(requestGroup, 0) {} PieceHashCheckIntegrityEntry(requestGroup, nullptr) {}
BtCheckIntegrityEntry::~BtCheckIntegrityEntry() {} BtCheckIntegrityEntry::~BtCheckIntegrityEntry() {}

2
src/BtFileAllocationEntry.cc
View File

@ -51,7 +51,7 @@
namespace aria2 { namespace aria2 {
BtFileAllocationEntry::BtFileAllocationEntry(RequestGroup* requestGroup): BtFileAllocationEntry::BtFileAllocationEntry(RequestGroup* requestGroup):
FileAllocationEntry(requestGroup, 0) {} FileAllocationEntry(requestGroup, nullptr) {}
BtFileAllocationEntry::~BtFileAllocationEntry() {} BtFileAllocationEntry::~BtFileAllocationEntry() {}

2
src/BtInterestedMessage.cc
View File

@ -43,7 +43,7 @@ const char BtInterestedMessage::NAME[] = "interested";
BtInterestedMessage::BtInterestedMessage() BtInterestedMessage::BtInterestedMessage()
: ZeroBtMessage(ID, NAME), : ZeroBtMessage(ID, NAME),
peerStorage_(0) peerStorage_(nullptr)
{} {}
BtInterestedMessage::~BtInterestedMessage() {} BtInterestedMessage::~BtInterestedMessage() {}

2
src/BtNotInterestedMessage.cc
View File

@ -43,7 +43,7 @@ const char BtNotInterestedMessage::NAME[] = "not interested";
BtNotInterestedMessage::BtNotInterestedMessage() BtNotInterestedMessage::BtNotInterestedMessage()
: ZeroBtMessage(ID, NAME), : ZeroBtMessage(ID, NAME),
peerStorage_(0) peerStorage_(nullptr)
{} {}
BtNotInterestedMessage::~BtNotInterestedMessage() {} BtNotInterestedMessage::~BtNotInterestedMessage() {}

6
src/BtPieceMessage.cc
View File

@ -72,9 +72,9 @@ BtPieceMessage::BtPieceMessage
index_(index), index_(index),
begin_(begin), begin_(begin),
blockLength_(blockLength), blockLength_(blockLength),
data_(0), data_(nullptr),
downloadContext_(0), downloadContext_(nullptr),
peerStorage_(0) peerStorage_(nullptr)
{ {
setUploading(true); setUploading(true);
} }

8
src/BtPortMessage.cc
View File

@ -55,10 +55,10 @@ const char BtPortMessage::NAME[] = "port";
BtPortMessage::BtPortMessage(uint16_t port) BtPortMessage::BtPortMessage(uint16_t port)
: SimpleBtMessage(ID, NAME), : SimpleBtMessage(ID, NAME),
port_(port), port_(port),
localNode_(0), localNode_(nullptr),
routingTable_(0), routingTable_(nullptr),
taskQueue_(0), taskQueue_(nullptr),
taskFactory_(0) taskFactory_(nullptr)
{} {}
std::unique_ptr<BtPortMessage> BtPortMessage::create std::unique_ptr<BtPortMessage> BtPortMessage::create

2
src/BufferedFile.cc
View File

@ -82,7 +82,7 @@ int BufferedFile::onClose()
int rv = 0; int rv = 0;
if (fp_) { if (fp_) {
rv = fclose(fp_); rv = fclose(fp_);
fp_ = 0; fp_ = nullptr;
} }
return rv; return rv;
} }

4
src/ConsoleStatCalc.cc
View File

@ -240,8 +240,8 @@ void printProgressSummary
time_t now; time_t now;
struct tm* staticNowtmPtr; struct tm* staticNowtmPtr;
char buf[26]; char buf[26];
if(time(&now) != (time_t)-1 && (staticNowtmPtr = localtime(&now)) != 0 && if(time(&now) != (time_t)-1 && (staticNowtmPtr = localtime(&now)) != nullptr &&
asctime_r(staticNowtmPtr, buf) != 0) { asctime_r(staticNowtmPtr, buf) != nullptr) {
char* lfptr = strchr(buf, '\n'); char* lfptr = strchr(buf, '\n');
if(lfptr) { if(lfptr) {
*lfptr = '\0'; *lfptr = '\0';

8
src/DHTAbstractTask.cc
View File

@ -47,10 +47,10 @@ namespace aria2 {
DHTAbstractTask::DHTAbstractTask(): DHTAbstractTask::DHTAbstractTask():
finished_(false), finished_(false),
routingTable_(0), routingTable_(nullptr),
dispatcher_(0), dispatcher_(nullptr),
factory_(0), factory_(nullptr),
taskQueue_(0) taskQueue_(nullptr)
{} {}
bool DHTAbstractTask::finished() bool DHTAbstractTask::finished()

10
src/DHTBucketTree.cc
View File

@ -45,7 +45,7 @@ namespace aria2 {
DHTBucketTreeNode::DHTBucketTreeNode DHTBucketTreeNode::DHTBucketTreeNode
(DHTBucketTreeNode* left, (DHTBucketTreeNode* left,
DHTBucketTreeNode* right) DHTBucketTreeNode* right)
: parent_(0), : parent_(nullptr),
left_(left), left_(left),
right_(right) right_(right)
{ {
@ -53,9 +53,9 @@ DHTBucketTreeNode::DHTBucketTreeNode
} }
DHTBucketTreeNode::DHTBucketTreeNode(const std::shared_ptr<DHTBucket>& bucket) DHTBucketTreeNode::DHTBucketTreeNode(const std::shared_ptr<DHTBucket>& bucket)
: parent_(0), : parent_(nullptr),
left_(0), left_(nullptr),
right_(0), right_(nullptr),
bucket_(bucket) bucket_(bucket)
{ {
memcpy(minId_, bucket_->getMinID(), DHT_ID_LENGTH); memcpy(minId_, bucket_->getMinID(), DHT_ID_LENGTH);
@ -79,7 +79,7 @@ void DHTBucketTreeNode::resetRelation()
DHTBucketTreeNode* DHTBucketTreeNode::dig(const unsigned char* key) DHTBucketTreeNode* DHTBucketTreeNode::dig(const unsigned char* key)
{ {
if(leaf()) { if(leaf()) {
return 0; return nullptr;
} }
if(left_->isInRange(key)) { if(left_->isInRange(key)) {
return left_; return left_;

8
src/DHTTaskFactoryImpl.cc
View File

@ -51,10 +51,10 @@
namespace aria2 { namespace aria2 {
DHTTaskFactoryImpl::DHTTaskFactoryImpl() DHTTaskFactoryImpl::DHTTaskFactoryImpl()
: routingTable_(0), : routingTable_(nullptr),
dispatcher_(0), dispatcher_(nullptr),
factory_(0), factory_(nullptr),
taskQueue_(0), taskQueue_(nullptr),
timeout_(DHT_MESSAGE_TIMEOUT) timeout_(DHT_MESSAGE_TIMEOUT)
{} {}

2
src/DHTUnknownMessage.cc
View File

@ -56,7 +56,7 @@ DHTUnknownMessage::DHTUnknownMessage(const std::shared_ptr<DHTNode>& localNode,
port_(port) port_(port)
{ {
if(length_ == 0) { if(length_ == 0) {
data_ = 0; data_ = nullptr;
} else { } else {
data_ = new unsigned char[length]; data_ = new unsigned char[length];
memcpy(data_, data, length); memcpy(data_, data, length);

4
src/DefaultBtInteractive.cc
View File

@ -91,7 +91,7 @@ DefaultBtInteractive::DefaultBtInteractive
downloadContext_(downloadContext), downloadContext_(downloadContext),
peer_(peer), peer_(peer),
metadataGetMode_(false), metadataGetMode_(false),
localNode_(0), localNode_(nullptr),
allowedFastSetSize_(10), allowedFastSetSize_(10),
haveTimer_(global::wallclock()), haveTimer_(global::wallclock()),
keepAliveTimer_(global::wallclock()), keepAliveTimer_(global::wallclock()),
@ -104,7 +104,7 @@ DefaultBtInteractive::DefaultBtInteractive
dhtEnabled_(false), dhtEnabled_(false),
numReceivedMessage_(0), numReceivedMessage_(0),
maxOutstandingRequest_(DEFAULT_MAX_OUTSTANDING_REQUEST), maxOutstandingRequest_(DEFAULT_MAX_OUTSTANDING_REQUEST),
requestGroupMan_(0), requestGroupMan_(nullptr),
tcpPort_(0), tcpPort_(0),
haveLastSent_(global::wallclock()) haveLastSent_(global::wallclock())
{} {}

2
src/DefaultBtMessageReceiver.cc
View File

@ -119,7 +119,7 @@ std::unique_ptr<BtMessage> DefaultBtMessageReceiver::receiveMessage()
{ {
size_t dataLength = 0; size_t dataLength = 0;
// Give 0 to PeerConnection::receiveMessage() to prevent memcpy. // Give 0 to PeerConnection::receiveMessage() to prevent memcpy.
if(!peerConnection_->receiveMessage(0, dataLength)) { if(!peerConnection_->receiveMessage(nullptr, dataLength)) {
return nullptr; return nullptr;
} }
auto msg = auto msg =

6
src/DefaultBtRequestFactory.cc
View File

@ -53,9 +53,9 @@
namespace aria2 { namespace aria2 {
DefaultBtRequestFactory::DefaultBtRequestFactory() DefaultBtRequestFactory::DefaultBtRequestFactory()
: pieceStorage_(0), : pieceStorage_(nullptr),
dispatcher_(0), dispatcher_(nullptr),
messageFactory_(0), messageFactory_(nullptr),
cuid_(0) cuid_(0)
{} {}

2
src/DefaultPieceStorage.cc
View File

@ -84,7 +84,7 @@ DefaultPieceStorage::DefaultPieceStorage
option_(option), option_(option),
pieceStatMan_(new PieceStatMan(downloadContext->getNumPieces(), true)), pieceStatMan_(new PieceStatMan(downloadContext->getNumPieces(), true)),
pieceSelector_(make_unique<RarestPieceSelector>(pieceStatMan_)), pieceSelector_(make_unique<RarestPieceSelector>(pieceStatMan_)),
wrDiskCache_(0) wrDiskCache_(nullptr)
{ {
const std::string& pieceSelectorOpt = const std::string& pieceSelectorOpt =
option_->get(PREF_STREAM_PIECE_SELECTOR); option_->get(PREF_STREAM_PIECE_SELECTOR);

4
src/DownloadContext.cc
View File

@ -51,7 +51,7 @@ DownloadContext::DownloadContext():
pieceLength_(0), pieceLength_(0),
checksumVerified_(false), checksumVerified_(false),
knowsTotalLength_(true), knowsTotalLength_(true),
ownerRequestGroup_(0), ownerRequestGroup_(nullptr),
attrs_(MAX_CTX_ATTR), attrs_(MAX_CTX_ATTR),
downloadStopTime_(0), downloadStopTime_(0),
acceptMetalink_(true) {} acceptMetalink_(true) {}
@ -62,7 +62,7 @@ DownloadContext::DownloadContext(int32_t pieceLength,
pieceLength_(pieceLength), pieceLength_(pieceLength),
checksumVerified_(false), checksumVerified_(false),
knowsTotalLength_(true), knowsTotalLength_(true),
ownerRequestGroup_(0), ownerRequestGroup_(nullptr),
attrs_(MAX_CTX_ATTR), attrs_(MAX_CTX_ATTR),
downloadStopTime_(0), downloadStopTime_(0),
acceptMetalink_(true) acceptMetalink_(true)

6
src/DownloadEngine.cc
View File

@ -99,10 +99,10 @@ DownloadEngine::DownloadEngine(std::unique_ptr<EventPoll> eventPoll)
btRegistry_(make_unique<BtRegistry>()), btRegistry_(make_unique<BtRegistry>()),
#endif // ENABLE_BITTORRENT #endif // ENABLE_BITTORRENT
#ifdef HAVE_ARES_ADDR_NODE #ifdef HAVE_ARES_ADDR_NODE
asyncDNSServers_(0), asyncDNSServers_(nullptr),
#endif // HAVE_ARES_ADDR_NODE #endif // HAVE_ARES_ADDR_NODE
dnsCache_(make_unique<DNSCache>()), dnsCache_(make_unique<DNSCache>()),
option_(0) option_(nullptr)
{ {
unsigned char sessionId[20]; unsigned char sessionId[20];
util::generateRandomKey(sessionId); util::generateRandomKey(sessionId);
@ -112,7 +112,7 @@ DownloadEngine::DownloadEngine(std::unique_ptr<EventPoll> eventPoll)
DownloadEngine::~DownloadEngine() DownloadEngine::~DownloadEngine()
{ {
#ifdef HAVE_ARES_ADDR_NODE #ifdef HAVE_ARES_ADDR_NODE
setAsyncDNSServers(0); setAsyncDNSServers(nullptr);
#endif // HAVE_ARES_ADDR_NODE #endif // HAVE_ARES_ADDR_NODE
} }

8
src/DownloadHandlerConstants.cc
View File

@ -40,7 +40,7 @@ namespace {
const char* METALINK_EXTENSIONS[] = { const char* METALINK_EXTENSIONS[] = {
".metalink", // Metalink3Spec ".metalink", // Metalink3Spec
".meta4", // Metalink4Spec ".meta4", // Metalink4Spec
0 nullptr
}; };
} // namespace } // namespace
@ -53,7 +53,7 @@ namespace {
const char* METALINK_CONTENT_TYPES[] = { const char* METALINK_CONTENT_TYPES[] = {
"application/metalink4+xml", // Metalink4Spec "application/metalink4+xml", // Metalink4Spec
"application/metalink+xml", // Metalink3Spec "application/metalink+xml", // Metalink3Spec
0 nullptr
}; };
} // namespace } // namespace
@ -65,7 +65,7 @@ const char** getMetalinkContentTypes()
namespace { namespace {
const char* BT_EXTENSIONS[] = { const char* BT_EXTENSIONS[] = {
".torrent", ".torrent",
0 nullptr
}; };
} // namespace } // namespace
@ -77,7 +77,7 @@ const char** getBtExtensions()
namespace { namespace {
const char* BT_CONTENT_TYPES[] = { const char* BT_CONTENT_TYPES[] = {
"application/x-bittorrent", "application/x-bittorrent",
0 nullptr
}; };
} // namespace } // namespace

2
src/DownloadResult.cc
View File

@ -40,7 +40,7 @@
namespace aria2 { namespace aria2 {
DownloadResult::DownloadResult() DownloadResult::DownloadResult()
: gid(0), : gid(nullptr),
inMemoryDownload(false), inMemoryDownload(false),
sessionDownloadLength(0), sessionDownloadLength(0),
sessionTime(0), sessionTime(0),

6
src/ExtensionMessageRegistry.cc
View File

@ -49,7 +49,7 @@ namespace {
const char* EXTENSION_NAMES[] = { const char* EXTENSION_NAMES[] = {
"ut_metadata", "ut_metadata",
"ut_pex", "ut_pex",
0 nullptr
}; };
} // namespace } // namespace
@ -63,7 +63,7 @@ const char* ExtensionMessageRegistry::getExtensionName(uint8_t id) const
{ {
int i; int i;
if(id == 0) { if(id == 0) {
return 0; return nullptr;
} }
for(i = 0; i < MAX_EXTENSION; ++i) { for(i = 0; i < MAX_EXTENSION; ++i) {
if(extensions_[i] == id) { if(extensions_[i] == id) {
@ -93,7 +93,7 @@ void ExtensionMessageRegistry::setExtensions(const Extensions& extensions)
const char* strBtExtension(int key) const char* strBtExtension(int key)
{ {
if(key >= ExtensionMessageRegistry::MAX_EXTENSION) { if(key >= ExtensionMessageRegistry::MAX_EXTENSION) {
return 0; return nullptr;
} else { } else {
return EXTENSION_NAMES[key]; return EXTENSION_NAMES[key];
} }

6
src/FeatureConfig.cc
View File

@ -104,7 +104,7 @@ const char* strSupportedFeature(int feature)
#ifdef ENABLE_ASYNC_DNS #ifdef ENABLE_ASYNC_DNS
return "Async DNS"; return "Async DNS";
#else // !ENABLE_ASYNC_DNS #else // !ENABLE_ASYNC_DNS
return 0; return nullptr;
#endif // !ENABLE_ASYNC_DNS #endif // !ENABLE_ASYNC_DNS
break; break;
@ -120,7 +120,7 @@ const char* strSupportedFeature(int feature)
#ifdef HAVE_SQLITE3 #ifdef HAVE_SQLITE3
return "Firefox3 Cookie"; return "Firefox3 Cookie";
#else // !HAVE_SQLITE3 #else // !HAVE_SQLITE3
return 0; return nullptr;
#endif // !HAVE_SQLITE3 #endif // !HAVE_SQLITE3
break; break;
@ -165,7 +165,7 @@ const char* strSupportedFeature(int feature)
break; break;
default: default:
return 0; return nullptr;
} }
} }

4
src/FileEntry.cc
View File

@ -536,7 +536,7 @@ size_t FileEntry::setUris(const std::vector<std::string>& uris)
bool FileEntry::addUri(const std::string& uri) bool FileEntry::addUri(const std::string& uri)
{ {
std::string peUri = util::percentEncodeMini(uri); std::string peUri = util::percentEncodeMini(uri);
if(uri_split(NULL, peUri.c_str()) == 0) { if(uri_split(nullptr, peUri.c_str()) == 0) {
uris_.push_back(peUri); uris_.push_back(peUri);
return true; return true;
} else { } else {
@ -547,7 +547,7 @@ bool FileEntry::addUri(const std::string& uri)
bool FileEntry::insertUri(const std::string& uri, size_t pos) bool FileEntry::insertUri(const std::string& uri, size_t pos)
{ {
std::string peUri = util::percentEncodeMini(uri); std::string peUri = util::percentEncodeMini(uri);
if(uri_split(NULL, peUri.c_str()) == 0) { if(uri_split(nullptr, peUri.c_str()) == 0) {
pos = std::min(pos, uris_.size()); pos = std::min(pos, uris_.size());
uris_.insert(uris_.begin()+pos, peUri); uris_.insert(uris_.begin()+pos, peUri);
return true; return true;

2
src/GZipDecodingStreamFilter.cc
View File

@ -78,7 +78,7 @@ void GZipDecodingStreamFilter::release()
if(strm_) { if(strm_) {
inflateEnd(strm_); inflateEnd(strm_);
delete strm_; delete strm_;
strm_ = 0; strm_ = nullptr;
} }
} }

6
src/GZipEncoder.cc
View File

@ -46,7 +46,7 @@ namespace {
const int OUTBUF_LENGTH = 4096; const int OUTBUF_LENGTH = 4096;
} // namespace } // namespace
GZipEncoder::GZipEncoder():strm_(0) {} GZipEncoder::GZipEncoder():strm_(nullptr) {}
GZipEncoder::~GZipEncoder() GZipEncoder::~GZipEncoder()
{ {
@ -74,7 +74,7 @@ void GZipEncoder::release()
if(strm_) { if(strm_) {
deflateEnd(strm_); deflateEnd(strm_);
delete strm_; delete strm_;
strm_ = 0; strm_ = nullptr;
} }
} }
@ -104,7 +104,7 @@ std::string GZipEncoder::encode
std::string GZipEncoder::str() std::string GZipEncoder::str()
{ {
internalBuf_ += encode(0, 0, Z_FINISH); internalBuf_ += encode(nullptr, 0, Z_FINISH);
return internalBuf_; return internalBuf_;
} }

6
src/GZipFile.cc
View File

@ -44,7 +44,7 @@
namespace aria2 { namespace aria2 {
GZipFile::GZipFile(const char* filename, const char* mode) GZipFile::GZipFile(const char* filename, const char* mode)
: fp_(0), : fp_(nullptr),
buflen_(1024), buf_(reinterpret_cast<char*>(malloc(buflen_))) buflen_(1024), buf_(reinterpret_cast<char*>(malloc(buflen_)))
{ {
FILE* fp = FILE* fp =
@ -85,7 +85,7 @@ int GZipFile::onClose()
int rv = 0; int rv = 0;
if (fp_) { if (fp_) {
rv = gzclose(fp_); rv = gzclose(fp_);
fp_ = 0; fp_ = nullptr;
} }
return rv; return rv;
} }
@ -99,7 +99,7 @@ bool GZipFile::isError() const
{ {
int rv = 0; int rv = 0;
const char *e = gzerror(fp_, &rv); const char *e = gzerror(fp_, &rv);
return (e != 0 && *e != 0) || rv != 0; return (e != nullptr && *e != 0) || rv != 0;
} }
bool GZipFile::isEOF() const bool GZipFile::isEOF() const

2
src/GrowSegment.cc
View File

@ -63,7 +63,7 @@ void GrowSegment::clear(WrDiskCache* diskCache)
{ {
writtenLength_ = 0; writtenLength_ = 0;
// cache won't be used in this object. // cache won't be used in this object.
piece_->clearAllBlock(0); piece_->clearAllBlock(nullptr);
} }
std::shared_ptr<Piece> GrowSegment::getPiece() const std::shared_ptr<Piece> GrowSegment::getPiece() const

2
src/HttpListenCommand.cc
View File

@ -103,7 +103,7 @@ bool HttpListenCommand::bindPort(uint16_t port)
if(e_->getOption()->getAsBool(PREF_RPC_LISTEN_ALL)) { if(e_->getOption()->getAsBool(PREF_RPC_LISTEN_ALL)) {
flags = AI_PASSIVE; flags = AI_PASSIVE;
} }
serverSocket_->bind(0, port, family_, flags); serverSocket_->bind(nullptr, port, family_, flags);
serverSocket_->beginListen(); serverSocket_->beginListen();
A2_LOG_INFO(fmt(MSG_LISTENING_PORT, A2_LOG_INFO(fmt(MSG_LISTENING_PORT,
getCuid(), port)); getCuid(), port));

6
src/HttpRequest.cc
View File

@ -61,9 +61,9 @@ HttpRequest::HttpRequest()
: contentEncodingEnabled_(true), : contentEncodingEnabled_(true),
userAgent_(USER_AGENT), userAgent_(USER_AGENT),
acceptMetalink_(false), acceptMetalink_(false),
cookieStorage_(0), cookieStorage_(nullptr),
authConfigFactory_(0), authConfigFactory_(nullptr),
option_(0), option_(nullptr),
noCache_(true), noCache_(true),
acceptGzip_(false), acceptGzip_(false),
endOffsetOverride_(0) endOffsetOverride_(0)

2
src/IOFile.cc
View File

@ -50,7 +50,7 @@ const char IOFile::APPEND[] = "ab";
IOFile::operator unspecified_bool_type() const IOFile::operator unspecified_bool_type() const
{ {
bool ok = isOpen() && !isError(); bool ok = isOpen() && !isError();
return ok ? &IOFile::goodState : 0; return ok ? &IOFile::goodState : nullptr;
} }
size_t IOFile::read(void* ptr, size_t count) size_t IOFile::read(void* ptr, size_t count)

2
src/LibuvEventPoll.cc
View File

@ -115,7 +115,7 @@ LibuvEventPoll::~LibuvEventPoll()
if (loop_) { if (loop_) {
uv_loop_delete(loop_); uv_loop_delete(loop_);
loop_ = 0; loop_ = nullptr;
} }
// Need this to free only after the loop is gone. // Need this to free only after the loop is gone.

4
src/Logger.cc
View File

@ -133,7 +133,7 @@ void writeHeader
(Output& fp, Logger::LEVEL level, const char* sourceFile, int lineNum) (Output& fp, Logger::LEVEL level, const char* sourceFile, int lineNum)
{ {
struct timeval tv; struct timeval tv;
gettimeofday(&tv, 0); gettimeofday(&tv, nullptr);
char datestr[20]; // 'YYYY-MM-DD hh:mm:ss'+'\0' = 20 bytes char datestr[20]; // 'YYYY-MM-DD hh:mm:ss'+'\0' = 20 bytes
struct tm tm; struct tm tm;
//tv.tv_sec may not be of type time_t. //tv.tv_sec may not be of type time_t.
@ -172,7 +172,7 @@ template<typename Output>
void writeHeaderConsole(Output& fp, Logger::LEVEL level, bool useColor) void writeHeaderConsole(Output& fp, Logger::LEVEL level, bool useColor)
{ {
struct timeval tv; struct timeval tv;
gettimeofday(&tv, 0); gettimeofday(&tv, nullptr);
char datestr[15]; // 'MM/DD hh:mm:ss'+'\0' = 15 bytes char datestr[15]; // 'MM/DD hh:mm:ss'+'\0' = 15 bytes
struct tm tm; struct tm tm;
//tv.tv_sec may not be of type time_t. //tv.tv_sec may not be of type time_t.

4
src/MSEHandshake.cc
View File

@ -81,12 +81,12 @@ MSEHandshake::MSEHandshake
rbufLength_(0), rbufLength_(0),
socketBuffer_(socket), socketBuffer_(socket),
negotiatedCryptoType_(CRYPTO_NONE), negotiatedCryptoType_(CRYPTO_NONE),
dh_(0), dh_(nullptr),
initiator_(true), initiator_(true),
markerIndex_(0), markerIndex_(0),
padLength_(0), padLength_(0),
iaLength_(0), iaLength_(0),
ia_(0), ia_(nullptr),
sha1_(MessageDigest::sha1()) sha1_(MessageDigest::sha1())
{} {}

2
src/MetalinkParserController.cc
View File

@ -581,7 +581,7 @@ void MetalinkParserController::setURLOfMetaurl(const std::string& url)
#endif // ENABLE_BITTORRENT #endif // ENABLE_BITTORRENT
{ {
std::string u = uri::joinUri(baseUri_, url); std::string u = uri::joinUri(baseUri_, url);
if(uri_split(NULL, u.c_str()) == 0) { if(uri_split(nullptr, u.c_str()) == 0) {
tMetaurl_->url = u; tMetaurl_->url = u;
} else { } else {
tMetaurl_->url = url; tMetaurl_->url = url;

2
src/MetalinkParserStateImpl.cc
View File

@ -58,7 +58,7 @@ public:
bool operator()(const XmlAttr& attr) const bool operator()(const XmlAttr& attr) const
{ {
return strcmp(attr.localname, localname_) == 0 && return strcmp(attr.localname, localname_) == 0 &&
(attr.nsUri == 0 || strcmp(attr.nsUri, nsUri_) == 0); (attr.nsUri == nullptr || strcmp(attr.nsUri, nsUri_) == 0);
} }
}; };
} // namespace } // namespace

2
src/NameResolver.cc
View File

@ -52,7 +52,7 @@ void NameResolver::resolve(std::vector<std::string>& resolvedAddresses,
{ {
struct addrinfo* res; struct addrinfo* res;
int s; int s;
s = callGetaddrinfo(&res, hostname.c_str(), 0, family_, socktype_, 0, 0); s = callGetaddrinfo(&res, hostname.c_str(), nullptr, family_, socktype_, 0, 0);
if(s) { if(s) {
throw DL_ABORT_EX2(fmt(EX_RESOLVE_HOSTNAME, throw DL_ABORT_EX2(fmt(EX_RESOLVE_HOSTNAME,
hostname.c_str(), gai_strerror(s)), hostname.c_str(), gai_strerror(s)),

6
src/Option.cc
View File

@ -122,7 +122,7 @@ int32_t Option::getAsInt(const Pref* pref) const {
if(value.empty()) { if(value.empty()) {
return 0; return 0;
} else { } else {
return strtol(value.c_str(), 0, 10); return strtol(value.c_str(), nullptr, 10);
} }
} }
@ -131,7 +131,7 @@ int64_t Option::getAsLLInt(const Pref* pref) const {
if(value.empty()) { if(value.empty()) {
return 0; return 0;
} else { } else {
return strtoll(value.c_str(), 0, 10); return strtoll(value.c_str(), nullptr, 10);
} }
} }
@ -144,7 +144,7 @@ double Option::getAsDouble(const Pref* pref) const {
if(value.empty()) { if(value.empty()) {
return 0.0; return 0.0;
} else { } else {
return strtod(value.c_str(), 0); return strtod(value.c_str(), nullptr);
} }
} }

2
src/OptionHandlerImpl.cc
View File

@ -241,7 +241,7 @@ FloatNumberOptionHandler::~FloatNumberOptionHandler() {}
void FloatNumberOptionHandler::parseArg void FloatNumberOptionHandler::parseArg
(Option& option, const std::string& optarg) const (Option& option, const std::string& optarg) const
{ {
double number = strtod(optarg.c_str(), 0); double number = strtod(optarg.c_str(), nullptr);
if((min_ < 0 || min_ <= number) && (max_ < 0 || number <= max_)) { if((min_ < 0 || min_ <= number) && (max_ < 0 || number <= max_)) {
option.put(pref_, optarg); option.put(pref_, optarg);
} else { } else {

2
src/OptionHandlerImpl.h
View File

@ -271,7 +271,7 @@ public:
// argument. // argument.
DeprecatedOptionHandler DeprecatedOptionHandler
(OptionHandler* depOptHandler, (OptionHandler* depOptHandler,
const OptionHandler* repOptHandler = 0); const OptionHandler* repOptHandler = nullptr);
virtual ~DeprecatedOptionHandler(); virtual ~DeprecatedOptionHandler();
virtual void parse(Option& option, const std::string& arg) const virtual void parse(Option& option, const std::string& arg) const
CXX11_OVERRIDE; CXX11_OVERRIDE;

12
src/OptionParser.cc
View File

@ -59,7 +59,7 @@
namespace aria2 { namespace aria2 {
OptionParser::OptionParser() OptionParser::OptionParser()
: handlers_(option::countOption(), 0), : handlers_(option::countOption(), nullptr),
shortOpts_(256) shortOpts_(256)
{} {}
@ -111,15 +111,15 @@ void putOptions(struct option* longOpts, int* plopt,
(*longOpts).flag = plopt; (*longOpts).flag = plopt;
(*longOpts).val = (*first)->getPref()->i; (*longOpts).val = (*first)->getPref()->i;
} else { } else {
(*longOpts).flag = 0; (*longOpts).flag = nullptr;
(*longOpts).val = (*first)->getShortName(); (*longOpts).val = (*first)->getShortName();
} }
++longOpts; ++longOpts;
} }
} }
(*longOpts).name = 0; (*longOpts).name = nullptr;
(*longOpts).has_arg = 0; (*longOpts).has_arg = 0;
(*longOpts).flag = 0; (*longOpts).flag = nullptr;
(*longOpts).val = 0; (*longOpts).val = 0;
} }
} // namespace } // namespace
@ -156,11 +156,11 @@ void OptionParser::parseArg
putOptions(longOpts.get(), &lopt, handlers_.begin(), handlers_.end()); putOptions(longOpts.get(), &lopt, handlers_.begin(), handlers_.end());
std::string optstring = createOptstring(handlers_.begin(), handlers_.end()); std::string optstring = createOptstring(handlers_.begin(), handlers_.end());
while(1) { while(1) {
int c = getopt_long(argc, argv, optstring.c_str(), longOpts.get(), 0); int c = getopt_long(argc, argv, optstring.c_str(), longOpts.get(), nullptr);
if(c == -1) { if(c == -1) {
break; break;
} }
const OptionHandler* op = 0; const OptionHandler* op = nullptr;
if(c == 0) { if(c == 0) {
op = findById(lopt); op = findById(lopt);
} else if(c != '?') { } else if(c != '?') {

4
src/Peer.cc
View File

@ -53,7 +53,7 @@ Peer::Peer(std::string ipaddr, uint16_t port, bool incoming):
firstContactTime_(global::wallclock()), firstContactTime_(global::wallclock()),
dropStartTime_(0), dropStartTime_(0),
seeder_(false), seeder_(false),
res_(0), res_(nullptr),
incoming_(incoming), incoming_(incoming),
localPeer_(false), localPeer_(false),
disconnectedGracefully_(false) disconnectedGracefully_(false)
@ -88,7 +88,7 @@ void Peer::reconfigureSessionResource(int32_t pieceLength, int64_t totalLength)
void Peer::releaseSessionResource() void Peer::releaseSessionResource()
{ {
delete res_; delete res_;
res_ = 0; res_ = nullptr;
} }
void Peer::setPeerId(const unsigned char* peerId) void Peer::setPeerId(const unsigned char* peerId)

2
src/Peer.h
View File

@ -129,7 +129,7 @@ public:
// Returns true iff res_ != 0. // Returns true iff res_ != 0.
bool isActive() const bool isActive() const
{ {
return res_ != 0; return res_ != nullptr;
} }
void setPeerId(const unsigned char* peerId); void setPeerId(const unsigned char* peerId);

2
src/PeerListenCommand.cc
View File

@ -77,7 +77,7 @@ bool PeerListenCommand::bindPort(uint16_t& port, SegList<int>& sgl)
eoi = ports.end(); i != eoi; ++i) { eoi = ports.end(); i != eoi; ++i) {
port = *i; port = *i;
try { try {
socket_->bind(0, port, family_); socket_->bind(nullptr, port, family_);
socket_->beginListen(); socket_->beginListen();
A2_LOG_NOTICE(fmt(_("IPv%d BitTorrent: listening on TCP port %u"), A2_LOG_NOTICE(fmt(_("IPv%d BitTorrent: listening on TCP port %u"),
ipv, port)); ipv, port));

2
src/PeerReceiveHandshakeCommand.cc
View File

@ -96,7 +96,7 @@ bool PeerReceiveHandshakeCommand::executeInternal()
size_t dataLength = 0; size_t dataLength = 0;
// Ignore return value. The received data is kept in // Ignore return value. The received data is kept in
// PeerConnection object because of peek = true. // PeerConnection object because of peek = true.
peerConnection_->receiveHandshake(0, dataLength, true); peerConnection_->receiveHandshake(nullptr, dataLength, true);
} }
if(peerConnection_->getBufferLength() >= 48) { if(peerConnection_->getBufferLength() >= 48) {
const unsigned char* data = peerConnection_->getBuffer(); const unsigned char* data = peerConnection_->getBuffer();

2
src/PeerSessionResource.cc
View File

@ -49,7 +49,7 @@ PeerSessionResource::PeerSessionResource(int32_t pieceLength, int64_t totalLengt
bitfieldMan_(new BitfieldMan(pieceLength, totalLength)), bitfieldMan_(new BitfieldMan(pieceLength, totalLength)),
lastDownloadUpdate_(0), lastDownloadUpdate_(0),
lastAmUnchoking_(0), lastAmUnchoking_(0),
dispatcher_(0), dispatcher_(nullptr),
amChoking_(true), amChoking_(true),
amInterested_(false), amInterested_(false),
peerChoking_(true), peerChoking_(true),

10
src/Piece.cc
View File

@ -52,8 +52,8 @@
namespace aria2 { namespace aria2 {
Piece::Piece():index_(0), length_(0), blockLength_(BLOCK_LENGTH), bitfield_(0), Piece::Piece():index_(0), length_(0), blockLength_(BLOCK_LENGTH), bitfield_(nullptr),
usedBySegment_(false), wrCache_(0) usedBySegment_(false), wrCache_(nullptr)
#ifdef ENABLE_MESSAGE_DIGEST #ifdef ENABLE_MESSAGE_DIGEST
, nextBegin_(0) , nextBegin_(0)
#endif // ENABLE_MESSAGE_DIGEST #endif // ENABLE_MESSAGE_DIGEST
@ -64,7 +64,7 @@ Piece::Piece(size_t index, int32_t length, int32_t blockLength)
length_(length), length_(length),
blockLength_(blockLength), blockLength_(blockLength),
bitfield_(new BitfieldMan(blockLength_, length)), bitfield_(new BitfieldMan(blockLength_, length)),
usedBySegment_(false), wrCache_(0) usedBySegment_(false), wrCache_(nullptr)
#ifdef ENABLE_MESSAGE_DIGEST #ifdef ENABLE_MESSAGE_DIGEST
,nextBegin_(0) ,nextBegin_(0)
#endif // ENABLE_MESSAGE_DIGEST #endif // ENABLE_MESSAGE_DIGEST
@ -325,7 +325,7 @@ void Piece::initWrCache(WrDiskCache* diskCache,
if(!diskCache) { if(!diskCache) {
return; return;
} }
assert(wrCache_ == 0); assert(wrCache_ == nullptr);
wrCache_ = new WrDiskCacheEntry(diskAdaptor); wrCache_ = new WrDiskCacheEntry(diskAdaptor);
bool rv = diskCache->add(wrCache_); bool rv = diskCache->add(wrCache_);
assert(rv); assert(rv);
@ -396,7 +396,7 @@ void Piece::releaseWrCache(WrDiskCache* diskCache)
if(diskCache && wrCache_) { if(diskCache && wrCache_) {
diskCache->remove(wrCache_); diskCache->remove(wrCache_);
delete wrCache_; delete wrCache_;
wrCache_ = 0; wrCache_ = nullptr;
} }
} }

2
src/ProtocolDetector.cc
View File

@ -55,7 +55,7 @@ ProtocolDetector::~ProtocolDetector() {}
bool ProtocolDetector::isStreamProtocol(const std::string& uri) const bool ProtocolDetector::isStreamProtocol(const std::string& uri) const
{ {
return uri_split(NULL, uri.c_str()) == 0; return uri_split(nullptr, uri.c_str()) == 0;
} }
bool ProtocolDetector::guessTorrentFile(const std::string& uri) const bool ProtocolDetector::guessTorrentFile(const std::string& uri) const

12
src/RequestGroup.cc
View File

@ -141,15 +141,15 @@ RequestGroup::RequestGroup(const std::shared_ptr<GroupId>& gid,
fileNotFoundCount_(0), fileNotFoundCount_(0),
timeout_(option->getAsInt(PREF_TIMEOUT)), timeout_(option->getAsInt(PREF_TIMEOUT)),
#ifdef ENABLE_BITTORRENT #ifdef ENABLE_BITTORRENT
btRuntime_(0), btRuntime_(nullptr),
peerStorage_(0), peerStorage_(nullptr),
#endif // ENABLE_BITTORRENT #endif // ENABLE_BITTORRENT
inMemoryDownload_(false), inMemoryDownload_(false),
maxDownloadSpeedLimit_(option->getAsInt(PREF_MAX_DOWNLOAD_LIMIT)), maxDownloadSpeedLimit_(option->getAsInt(PREF_MAX_DOWNLOAD_LIMIT)),
maxUploadSpeedLimit_(option->getAsInt(PREF_MAX_UPLOAD_LIMIT)), maxUploadSpeedLimit_(option->getAsInt(PREF_MAX_UPLOAD_LIMIT)),
lastErrorCode_(error_code::UNDEFINED), lastErrorCode_(error_code::UNDEFINED),
belongsToGID_(0), belongsToGID_(0),
requestGroupMan_(0), requestGroupMan_(nullptr),
resumeFailureCount_(0) resumeFailureCount_(0)
{ {
fileAllocationEnabled_ = option_->get(PREF_FILE_ALLOCATION) != V_NONE; fileAllocationEnabled_ = option_->get(PREF_FILE_ALLOCATION) != V_NONE;
@ -314,7 +314,7 @@ void RequestGroup::createInitialCommand
} }
} }
DefaultBtProgressInfoFile* progressInfoFilePtr = 0; DefaultBtProgressInfoFile* progressInfoFilePtr = nullptr;
std::shared_ptr<BtProgressInfoFile> progressInfoFile; std::shared_ptr<BtProgressInfoFile> progressInfoFile;
if(!metadataGetMode) { if(!metadataGetMode) {
progressInfoFilePtr = new DefaultBtProgressInfoFile(downloadContext_, progressInfoFilePtr = new DefaultBtProgressInfoFile(downloadContext_,
@ -997,8 +997,8 @@ void RequestGroup::releaseRuntimeResource(DownloadEngine* e)
{ {
#ifdef ENABLE_BITTORRENT #ifdef ENABLE_BITTORRENT
e->getBtRegistry()->remove(gid_->getNumericId()); e->getBtRegistry()->remove(gid_->getNumericId());
btRuntime_ = 0; btRuntime_ = nullptr;
peerStorage_ = 0; peerStorage_ = nullptr;
#endif // ENABLE_BITTORRENT #endif // ENABLE_BITTORRENT
if(pieceStorage_) { if(pieceStorage_) {
pieceStorage_->removeAdvertisedPiece(0); pieceStorage_->removeAdvertisedPiece(0);

4
src/RequestGroupMan.cc
View File

@ -111,7 +111,7 @@ RequestGroupMan::RequestGroupMan
removedErrorResult_(0), removedErrorResult_(0),
removedLastErrorResult_(error_code::FINISHED), removedLastErrorResult_(error_code::FINISHED),
maxDownloadResult_(option->getAsInt(PREF_MAX_DOWNLOAD_RESULT)), maxDownloadResult_(option->getAsInt(PREF_MAX_DOWNLOAD_RESULT)),
wrDiskCache_(0) wrDiskCache_(nullptr)
{ {
appendReservedGroup(reservedGroups_, appendReservedGroup(reservedGroups_,
requestGroups.begin(), requestGroups.end()); requestGroups.begin(), requestGroups.end());
@ -962,7 +962,7 @@ void RequestGroupMan::setUriListParser
void RequestGroupMan::initWrDiskCache() void RequestGroupMan::initWrDiskCache()
{ {
assert(wrDiskCache_ == 0); assert(wrDiskCache_ == nullptr);
size_t limit = option_->getAsInt(PREF_DISK_CACHE); size_t limit = option_->getAsInt(PREF_DISK_CACHE);
if(limit > 0) { if(limit > 0) {
wrDiskCache_ = new WrDiskCache(limit); wrDiskCache_ = new WrDiskCache(limit);

2
src/SelectEventPoll.cc
View File

@ -198,7 +198,7 @@ void SelectEventPoll::poll(const struct timeval& tv)
#ifdef __MINGW32__ #ifdef __MINGW32__
retval = select(fdmax_+1, &rfds, &wfds, &efds, &ttv); retval = select(fdmax_+1, &rfds, &wfds, &efds, &ttv);
#else // !__MINGW32__ #else // !__MINGW32__
retval = select(fdmax_+1, &rfds, &wfds, NULL, &ttv); retval = select(fdmax_+1, &rfds, &wfds, nullptr, &ttv);
#endif // !__MINGW32__ #endif // !__MINGW32__
} while(retval == -1 && errno == EINTR); } while(retval == -1 && errno == EINTR);
if(retval > 0) { if(retval > 0) {

2
src/SimpleRandomizer.cc
View File

@ -56,7 +56,7 @@ const std::unique_ptr<SimpleRandomizer>& SimpleRandomizer::getInstance()
void SimpleRandomizer::init() void SimpleRandomizer::init()
{ {
#ifndef __MINGW32__ #ifndef __MINGW32__
srandom(time(0)^getpid()); srandom(time(nullptr)^getpid());
#endif // !__MINGW32__ #endif // !__MINGW32__
} }

2
src/SingleFileAllocationIterator.cc
View File

@ -55,7 +55,7 @@ SingleFileAllocationIterator::SingleFileAllocationIterator
: stream_(stream), : stream_(stream),
offset_(offset), offset_(offset),
totalLength_(totalLength), totalLength_(totalLength),
buffer_(0) buffer_(nullptr)
{} {}
SingleFileAllocationIterator::~SingleFileAllocationIterator() SingleFileAllocationIterator::~SingleFileAllocationIterator()

2
src/SinkStreamFilter.h
View File

@ -47,7 +47,7 @@ private:
bool hashUpdate_; bool hashUpdate_;
size_t bytesProcessed_; size_t bytesProcessed_;
public: public:
SinkStreamFilter(WrDiskCache* wrDiskCache = 0, bool hashUpdate = false); SinkStreamFilter(WrDiskCache* wrDiskCache = nullptr, bool hashUpdate = false);
virtual void init() CXX11_OVERRIDE {} virtual void init() CXX11_OVERRIDE {}

32
src/SocketCore.cc
View File

@ -103,12 +103,12 @@ std::string errorMsg(int errNum)
if (FormatMessage( if (FormatMessage(
FORMAT_MESSAGE_FROM_SYSTEM | FORMAT_MESSAGE_FROM_SYSTEM |
FORMAT_MESSAGE_IGNORE_INSERTS, FORMAT_MESSAGE_IGNORE_INSERTS,
NULL, nullptr,
errNum, errNum,
MAKELANGID(LANG_ENGLISH, SUBLANG_ENGLISH_US), MAKELANGID(LANG_ENGLISH, SUBLANG_ENGLISH_US),
(LPTSTR) &buf, (LPTSTR) &buf,
sizeof(buf), sizeof(buf),
NULL nullptr
) == 0) { ) == 0) {
snprintf(buf, sizeof(buf), EX_SOCKET_UNKNOWN_ERROR, errNum, errNum); snprintf(buf, sizeof(buf), EX_SOCKET_UNKNOWN_ERROR, errNum, errNum);
} }
@ -267,7 +267,7 @@ void SocketCore::bindWithFamily(uint16_t port, int family, int flags)
{ {
closeConnection(); closeConnection();
std::string error; std::string error;
sock_t fd = bindTo(0, port, family, sockType_, flags, error); sock_t fd = bindTo(nullptr, port, family, sockType_, flags, error);
if(fd == (sock_t) -1) { if(fd == (sock_t) -1) {
throw DL_ABORT_EX(fmt(EX_SOCKET_BIND, error.c_str())); throw DL_ABORT_EX(fmt(EX_SOCKET_BIND, error.c_str()));
} else { } else {
@ -284,7 +284,7 @@ void SocketCore::bind
if(addr && addr[0]) { if(addr && addr[0]) {
addrp = addr; addrp = addr;
} else { } else {
addrp = 0; addrp = nullptr;
} }
if(!(flags&AI_PASSIVE) || bindAddrs_.empty()) { if(!(flags&AI_PASSIVE) || bindAddrs_.empty()) {
sock_t fd = bindTo(addrp, port, family, sockType_, flags, error); sock_t fd = bindTo(addrp, port, family, sockType_, flags, error);
@ -297,7 +297,7 @@ void SocketCore::bind
i != eoi; ++i) { i != eoi; ++i) {
char host[NI_MAXHOST]; char host[NI_MAXHOST];
int s; int s;
s = getnameinfo(&(*i).first.sa, (*i).second, host, NI_MAXHOST, 0, 0, s = getnameinfo(&(*i).first.sa, (*i).second, host, NI_MAXHOST, nullptr, 0,
NI_NUMERICHOST); NI_NUMERICHOST);
if(s) { if(s) {
error = gai_strerror(s); error = gai_strerror(s);
@ -321,7 +321,7 @@ void SocketCore::bind
void SocketCore::bind(uint16_t port, int flags) void SocketCore::bind(uint16_t port, int flags)
{ {
bind(0, port, protocolFamily_, flags); bind(nullptr, port, protocolFamily_, flags);
} }
void SocketCore::bind(const struct sockaddr* addr, socklen_t addrlen) void SocketCore::bind(const struct sockaddr* addr, socklen_t addrlen)
@ -622,7 +622,7 @@ bool SocketCore::isWritable(time_t timeout)
tv.tv_sec = timeout; tv.tv_sec = timeout;
tv.tv_usec = 0; tv.tv_usec = 0;
int r = select(sockfd_+1, NULL, &fds, NULL, &tv); int r = select(sockfd_+1, nullptr, &fds, nullptr, &tv);
int errNum = SOCKET_ERRNO; int errNum = SOCKET_ERRNO;
if(r == 1) { if(r == 1) {
return true; return true;
@ -668,7 +668,7 @@ bool SocketCore::isReadable(time_t timeout)
tv.tv_sec = timeout; tv.tv_sec = timeout;
tv.tv_usec = 0; tv.tv_usec = 0;
int r = select(sockfd_+1, &fds, NULL, NULL, &tv); int r = select(sockfd_+1, &fds, nullptr, nullptr, &tv);
int errNum = SOCKET_ERRNO; int errNum = SOCKET_ERRNO;
if(r == 1) { if(r == 1) {
return true; return true;
@ -986,7 +986,7 @@ void SocketCore::bindAddress(const std::string& iface)
i != eoi; ++i) { i != eoi; ++i) {
char host[NI_MAXHOST]; char host[NI_MAXHOST];
int s; int s;
s = getnameinfo(&(*i).first.sa, (*i).second, host, NI_MAXHOST, 0, 0, s = getnameinfo(&(*i).first.sa, (*i).second, host, NI_MAXHOST, nullptr, 0,
NI_NUMERICHOST); NI_NUMERICHOST);
if(s == 0) { if(s == 0) {
A2_LOG_DEBUG(fmt("Sockets will bind to %s", host)); A2_LOG_DEBUG(fmt("Sockets will bind to %s", host));
@ -1002,7 +1002,7 @@ void getInterfaceAddress
A2_LOG_DEBUG(fmt("Finding interface %s", iface.c_str())); A2_LOG_DEBUG(fmt("Finding interface %s", iface.c_str()));
#ifdef HAVE_GETIFADDRS #ifdef HAVE_GETIFADDRS
// First find interface in interface addresses // First find interface in interface addresses
struct ifaddrs* ifaddr = 0; struct ifaddrs* ifaddr = nullptr;
if(getifaddrs(&ifaddr) == -1) { if(getifaddrs(&ifaddr) == -1) {
int errNum = SOCKET_ERRNO; int errNum = SOCKET_ERRNO;
A2_LOG_INFO(fmt(MSG_INTERFACE_NOT_FOUND, A2_LOG_INFO(fmt(MSG_INTERFACE_NOT_FOUND,
@ -1044,7 +1044,7 @@ void getInterfaceAddress
if(ifAddrs.empty()) { if(ifAddrs.empty()) {
addrinfo* res; addrinfo* res;
int s; int s;
s = callGetaddrinfo(&res, iface.c_str(), 0, family, SOCK_STREAM, aiFlags,0); s = callGetaddrinfo(&res, iface.c_str(), nullptr, family, SOCK_STREAM, aiFlags,0);
if(s) { if(s) {
A2_LOG_INFO(fmt(MSG_INTERFACE_NOT_FOUND, iface.c_str(), gai_strerror(s))); A2_LOG_INFO(fmt(MSG_INTERFACE_NOT_FOUND, iface.c_str(), gai_strerror(s)));
} else { } else {
@ -1111,7 +1111,7 @@ int inetNtop(int af, const void* src, char* dst, socklen_t size)
#endif // HAVE_SOCKADDR_IN_SIN_LEN #endif // HAVE_SOCKADDR_IN_SIN_LEN
memcpy(&su.in.sin_addr, src, sizeof(su.in.sin_addr)); memcpy(&su.in.sin_addr, src, sizeof(su.in.sin_addr));
s = getnameinfo(&su.sa, sizeof(su.in), s = getnameinfo(&su.sa, sizeof(su.in),
dst, size, 0, 0, NI_NUMERICHOST); dst, size, nullptr, 0, NI_NUMERICHOST);
} else if(af == AF_INET6) { } else if(af == AF_INET6) {
su.in6.sin6_family = AF_INET6; su.in6.sin6_family = AF_INET6;
#ifdef HAVE_SOCKADDR_IN6_SIN6_LEN #ifdef HAVE_SOCKADDR_IN6_SIN6_LEN
@ -1119,7 +1119,7 @@ int inetNtop(int af, const void* src, char* dst, socklen_t size)
#endif // HAVE_SOCKADDR_IN6_SIN6_LEN #endif // HAVE_SOCKADDR_IN6_SIN6_LEN
memcpy(&su.in6.sin6_addr, src, sizeof(su.in6.sin6_addr)); memcpy(&su.in6.sin6_addr, src, sizeof(su.in6.sin6_addr));
s = getnameinfo(&su.sa, sizeof(su.in6), s = getnameinfo(&su.sa, sizeof(su.in6),
dst, size, 0, 0, NI_NUMERICHOST); dst, size, nullptr, 0, NI_NUMERICHOST);
} else { } else {
s = EAI_FAMILY; s = EAI_FAMILY;
} }
@ -1157,7 +1157,7 @@ size_t getBinAddr(void* dest, const std::string& ip)
{ {
size_t len = 0; size_t len = 0;
addrinfo* res; addrinfo* res;
if(callGetaddrinfo(&res, ip.c_str(), 0, AF_UNSPEC, if(callGetaddrinfo(&res, ip.c_str(), nullptr, AF_UNSPEC,
0, AI_NUMERICHOST, 0) != 0) { 0, AI_NUMERICHOST, 0) != 0) {
return len; return len;
} }
@ -1307,7 +1307,7 @@ void checkAddrconfig()
A2_LOG_INFO("Checking configured addresses"); A2_LOG_INFO("Checking configured addresses");
ipv4AddrConfigured = false; ipv4AddrConfigured = false;
ipv6AddrConfigured = false; ipv6AddrConfigured = false;
ifaddrs* ifaddr = 0; ifaddrs* ifaddr = nullptr;
int rv; int rv;
rv = getifaddrs(&ifaddr); rv = getifaddrs(&ifaddr);
if(rv == -1) { if(rv == -1) {
@ -1348,7 +1348,7 @@ void checkAddrconfig()
default: default:
continue; continue;
} }
rv = getnameinfo(ifa->ifa_addr, addrlen, host, NI_MAXHOST, 0, 0, rv = getnameinfo(ifa->ifa_addr, addrlen, host, NI_MAXHOST, nullptr, 0,
NI_NUMERICHOST); NI_NUMERICHOST);
if(rv == 0) { if(rv == 0) {
if(found) { if(found) {

6
src/TimeA2.cc
View File

@ -80,12 +80,12 @@ bool Time::operator<(const Time& time) const
} }
void Time::reset() { void Time::reset() {
gettimeofday(&tv_, 0); gettimeofday(&tv_, nullptr);
} }
struct timeval Time::getCurrentTime() const { struct timeval Time::getCurrentTime() const {
struct timeval now; struct timeval now;
gettimeofday(&now, 0); gettimeofday(&now, nullptr);
return now; return now;
} }
@ -94,7 +94,7 @@ bool Time::elapsed(time_t sec) const {
// the time this function is called before specified time passes, we first do // the time this function is called before specified time passes, we first do
// simple test using time. // simple test using time.
// Then only when the further test is required, call gettimeofday. // Then only when the further test is required, call gettimeofday.
time_t now = time(0); time_t now = time(nullptr);
if(tv_.tv_sec+sec < now) { if(tv_.tv_sec+sec < now) {
return true; return true;
} else if(tv_.tv_sec+sec == now) { } else if(tv_.tv_sec+sec == now) {

2
src/TimerA2.cc
View File

@ -95,7 +95,7 @@ static timeval getCurrentTime()
tv.tv_sec = ts.tv_sec+2678400; // 1month offset(24*3600*31) tv.tv_sec = ts.tv_sec+2678400; // 1month offset(24*3600*31)
tv.tv_usec = ts.tv_nsec/1000; tv.tv_usec = ts.tv_nsec/1000;
} else { } else {
gettimeofday(&tv, 0); gettimeofday(&tv, nullptr);
} }
return tv; return tv;
} }

4
src/UDPTrackerClient.cc
View File

@ -474,12 +474,12 @@ UDPTrackerConnection* UDPTrackerClient::getConnectionId
UDPTrackerConnection>::iterator i = UDPTrackerConnection>::iterator i =
connectionIdCache_.find(std::make_pair(remoteAddr, remotePort)); connectionIdCache_.find(std::make_pair(remoteAddr, remotePort));
if(i == connectionIdCache_.end()) { if(i == connectionIdCache_.end()) {
return 0; return nullptr;
} }
if((*i).second.state == UDPT_CST_CONNECTED && if((*i).second.state == UDPT_CST_CONNECTED &&
(*i).second.lastUpdated.difference(now) > 60) { (*i).second.lastUpdated.difference(now) > 60) {
connectionIdCache_.erase(i); connectionIdCache_.erase(i);
return 0; return nullptr;
} else { } else {
return &(*i).second; return &(*i).second;
} }

2
src/UnknownLengthPieceStorage.cc
View File

@ -156,7 +156,7 @@ std::shared_ptr<Piece> UnknownLengthPieceStorage::getMissingPiece
cuid_t cuid) cuid_t cuid)
{ {
if(index == 0) { if(index == 0) {
return getMissingPiece(0, 0, 0, cuid); return getMissingPiece(0, nullptr, 0, cuid);
} else { } else {
return nullptr; return nullptr;
} }

4
src/UnknownLengthPieceStorage.h
View File

@ -205,7 +205,7 @@ public:
virtual const unsigned char* getBitfield() CXX11_OVERRIDE virtual const unsigned char* getBitfield() CXX11_OVERRIDE
{ {
return 0; return nullptr;
} }
virtual void setBitfield(const unsigned char* bitfield, virtual void setBitfield(const unsigned char* bitfield,
@ -232,7 +232,7 @@ public:
virtual std::shared_ptr<DiskAdaptor> getDiskAdaptor() CXX11_OVERRIDE; virtual std::shared_ptr<DiskAdaptor> getDiskAdaptor() CXX11_OVERRIDE;
virtual WrDiskCache* getWrDiskCache() CXX11_OVERRIDE { return 0; } virtual WrDiskCache* getWrDiskCache() CXX11_OVERRIDE { return nullptr; }
virtual void flushWrDiskCacheEntry() CXX11_OVERRIDE {} virtual void flushWrDiskCacheEntry() CXX11_OVERRIDE {}

2
src/WatchProcessCommand.cc
View File

@ -107,7 +107,7 @@ void WatchProcessCommand::process()
mib[2]=KERN_PROC_PID; mib[2]=KERN_PROC_PID;
mib[3]=pid_; mib[3]=pid_;
int ret = sysctl(mib, MIBSIZE, &kp, &len, NULL, 0); int ret = sysctl(mib, MIBSIZE, &kp, &len, nullptr, 0);
if (ret == -1 || len <= 0) { if (ret == -1 || len <= 0) {
waiting = false; waiting = false;
} }

2
src/WebSocketSession.cc
View File

@ -160,7 +160,7 @@ void onMsgRecvCallback(wslay_event_context_ptr wsctx,
if(!wslay_is_ctrl_frame(arg->opcode)) { if(!wslay_is_ctrl_frame(arg->opcode)) {
// TODO Only process text frame // TODO Only process text frame
ssize_t error = 0; ssize_t error = 0;
auto json = wsSession->parseFinal(0, 0, error); auto json = wsSession->parseFinal(nullptr, 0, error);
if(error < 0) { if(error < 0) {
A2_LOG_INFO("Failed to parse JSON-RPC request"); A2_LOG_INFO("Failed to parse JSON-RPC request");
RpcResponse res RpcResponse res

60
src/Xml2XmlParser.cc
View File

@ -121,45 +121,45 @@ void mlCharacters(void* userData, const xmlChar* ch, int len)
namespace { namespace {
xmlSAXHandler mySAXHandler = xmlSAXHandler mySAXHandler =
{ {
0, // internalSubsetSAXFunc nullptr, // internalSubsetSAXFunc
0, // isStandaloneSAXFunc nullptr, // isStandaloneSAXFunc
0, // hasInternalSubsetSAXFunc nullptr, // hasInternalSubsetSAXFunc
0, // hasExternalSubsetSAXFunc nullptr, // hasExternalSubsetSAXFunc
0, // resolveEntitySAXFunc nullptr, // resolveEntitySAXFunc
0, // getEntitySAXFunc nullptr, // getEntitySAXFunc
0, // entityDeclSAXFunc nullptr, // entityDeclSAXFunc
0, // notationDeclSAXFunc nullptr, // notationDeclSAXFunc
0, // attributeDeclSAXFunc nullptr, // attributeDeclSAXFunc
0, // elementDeclSAXFunc nullptr, // elementDeclSAXFunc
0, // unparsedEntityDeclSAXFunc nullptr, // unparsedEntityDeclSAXFunc
0, // setDocumentLocatorSAXFunc nullptr, // setDocumentLocatorSAXFunc
0, // startDocumentSAXFunc nullptr, // startDocumentSAXFunc
0, // endDocumentSAXFunc nullptr, // endDocumentSAXFunc
0, // startElementSAXFunc nullptr, // startElementSAXFunc
0, // endElementSAXFunc nullptr, // endElementSAXFunc
0, // referenceSAXFunc nullptr, // referenceSAXFunc
&mlCharacters, // charactersSAXFunc &mlCharacters, // charactersSAXFunc
0, // ignorableWhitespaceSAXFunc nullptr, // ignorableWhitespaceSAXFunc
0, // processingInstructionSAXFunc nullptr, // processingInstructionSAXFunc
0, // commentSAXFunc nullptr, // commentSAXFunc
0, // warningSAXFunc nullptr, // warningSAXFunc
0, // errorSAXFunc nullptr, // errorSAXFunc
0, // fatalErrorSAXFunc nullptr, // fatalErrorSAXFunc
0, // getParameterEntitySAXFunc nullptr, // getParameterEntitySAXFunc
0, // cdataBlockSAXFunc nullptr, // cdataBlockSAXFunc
0, // externalSubsetSAXFunc nullptr, // externalSubsetSAXFunc
XML_SAX2_MAGIC, // unsigned int initialized XML_SAX2_MAGIC, // unsigned int initialized
0, // void * _private nullptr, // void * _private
&mlStartElement, // startElementNsSAX2Func &mlStartElement, // startElementNsSAX2Func
&mlEndElement, // endElementNsSAX2Func &mlEndElement, // endElementNsSAX2Func
0, // xmlStructuredErrorFunc nullptr, // xmlStructuredErrorFunc
}; };
} // namespace } // namespace
XmlParser::XmlParser(ParserStateMachine* psm) XmlParser::XmlParser(ParserStateMachine* psm)
: psm_(psm), : psm_(psm),
sessionData_(psm), sessionData_(psm),
ctx_(xmlCreatePushParserCtxt(&mySAXHandler, &sessionData_, 0, 0, 0)), ctx_(xmlCreatePushParserCtxt(&mySAXHandler, &sessionData_, nullptr, 0, nullptr)),
lastError_(0) lastError_(0)
{} {}
@ -198,7 +198,7 @@ int XmlParser::reset()
{ {
psm_->reset(); psm_->reset();
sessionData_.reset(); sessionData_.reset();
int rv = xmlCtxtResetPush(ctx_, 0, 0, 0, 0); int rv = xmlCtxtResetPush(ctx_, nullptr, 0, nullptr, nullptr);
if(rv != 0) { if(rv != 0) {
return lastError_ = ERR_RESET; return lastError_ = ERR_RESET;
} else { } else {

8
src/XmlAttr.cc
View File

@ -37,10 +37,10 @@
namespace aria2 { namespace aria2 {
XmlAttr::XmlAttr() XmlAttr::XmlAttr()
: localname(0), : localname(nullptr),
prefix(0), prefix(nullptr),
nsUri(0), nsUri(nullptr),
value(0), value(nullptr),
valueLength(0) valueLength(0)
{} {}

2
src/XmlParser.cc
View File

@ -65,7 +65,7 @@ bool parseFile(const std::string& filename, ParserStateMachine* psm)
} }
} }
if(nread == 0 && retval) { if(nread == 0 && retval) {
if(ps.parseFinal(0, 0) < 0) { if(ps.parseFinal(nullptr, 0) < 0) {
retval = false; retval = false;
} }
} }

2
src/XmlRpcDiskWriter.cc
View File

@ -62,7 +62,7 @@ void XmlRpcDiskWriter::writeData(const unsigned char* data, size_t len,
int XmlRpcDiskWriter::finalize() int XmlRpcDiskWriter::finalize()
{ {
return parser_.parseFinal(0, 0); return parser_.parseFinal(nullptr, 0);
} }
RpcRequest XmlRpcDiskWriter::getResult() RpcRequest XmlRpcDiskWriter::getResult()

10
src/aria2api.cc
View File

@ -69,7 +69,7 @@
namespace aria2 { namespace aria2 {
Session::Session(const KeyVals& options) Session::Session(const KeyVals& options)
: context(new Context(false, 0, 0, options)) : context(new Context(false, 0, nullptr, options))
{} {}
Session::~Session() Session::~Session()
@ -78,12 +78,12 @@ Session::~Session()
SessionConfig::SessionConfig() SessionConfig::SessionConfig()
: keepRunning(false), : keepRunning(false),
useSignalHandler(true), useSignalHandler(true),
downloadEventCallback(0), downloadEventCallback(nullptr),
userData(0) userData(nullptr)
{} {}
namespace { namespace {
Platform* platform = 0; Platform* platform = nullptr;
} // namespace } // namespace
int libraryInit() int libraryInit()
@ -934,7 +934,7 @@ DownloadHandle* getDownloadHandle(Session* session, A2Gid gid)
return new DownloadResultDH(ds); return new DownloadResultDH(ds);
} }
} }
return 0; return nullptr;
} }
void deleteDownloadHandle(DownloadHandle* dh) void deleteDownloadHandle(DownloadHandle* dh)

2
src/metalink_helper.cc
View File

@ -143,7 +143,7 @@ std::unique_ptr<Metalinker> parseBinaryStream
offread += nread; offread += nread;
} }
if(nread == 0 && retval) { if(nread == 0 && retval) {
if(ps.parseFinal(0, 0) < 0) { if(ps.parseFinal(nullptr, 0) < 0) {
retval = false; retval = false;
} }
} }

16
src/util.cc
View File

@ -867,7 +867,7 @@ ssize_t parse_content_disposition(char *dest, size_t destlen,
const char **charsetp, size_t *charsetlenp, const char **charsetp, size_t *charsetlenp,
const char *in, size_t len) const char *in, size_t len)
{ {
const char *p = in, *eop = in + len, *mark_first = NULL, *mark_last = NULL; const char *p = in, *eop = in + len, *mark_first = nullptr, *mark_last = nullptr;
int state = CD_BEFORE_DISPOSITION_TYPE; int state = CD_BEFORE_DISPOSITION_TYPE;
int in_file_parm = 0; int in_file_parm = 0;
int flags = 0; int flags = 0;
@ -880,7 +880,7 @@ ssize_t parse_content_disposition(char *dest, size_t destlen,
uint32_t dfa_code = 0; uint32_t dfa_code = 0;
uint8_t pctval = 0; uint8_t pctval = 0;
*charsetp = NULL; *charsetp = nullptr;
*charsetlenp = 0; *charsetlenp = 0;
for(; p != eop; ++p) { for(; p != eop; ++p) {
@ -1226,7 +1226,7 @@ bool isNumericHost(const std::string& name)
memset(&hints, 0, sizeof(hints)); memset(&hints, 0, sizeof(hints));
hints.ai_family = AF_UNSPEC; hints.ai_family = AF_UNSPEC;
hints.ai_flags = AI_NUMERICHOST; hints.ai_flags = AI_NUMERICHOST;
if(getaddrinfo(name.c_str(), 0, &hints, &res)) { if(getaddrinfo(name.c_str(), nullptr, &hints, &res)) {
return false; return false;
} }
freeaddrinfo(res); freeaddrinfo(res);
@ -1315,7 +1315,7 @@ void setGlobalSignalHandler(int sig, sigset_t* mask, signal_handler_t handler,
sigact.sa_handler = handler; sigact.sa_handler = handler;
sigact.sa_flags = flags; sigact.sa_flags = flags;
sigact.sa_mask = *mask; sigact.sa_mask = *mask;
sigaction(sig, &sigact, NULL); sigaction(sig, &sigact, nullptr);
#else #else
signal(sig, handler); signal(sig, handler);
#endif // HAVE_SIGACTION #endif // HAVE_SIGACTION
@ -1847,13 +1847,13 @@ void executeHook
cmdlineLen = utf8ToWChar(wcharCmdline.get(), cmdlineLen, cmdline.c_str()); cmdlineLen = utf8ToWChar(wcharCmdline.get(), cmdlineLen, cmdline.c_str());
assert(cmdlineLen > 0); assert(cmdlineLen > 0);
A2_LOG_INFO(fmt("Executing user command: %s", cmdline.c_str())); A2_LOG_INFO(fmt("Executing user command: %s", cmdline.c_str()));
DWORD rc = CreateProcessW(batch ? utf8ToWChar(cmdexe).c_str() : NULL, DWORD rc = CreateProcessW(batch ? utf8ToWChar(cmdexe).c_str() : nullptr,
wcharCmdline.get(), wcharCmdline.get(),
NULL, nullptr,
NULL, nullptr,
true, true,
0, 0,
NULL, nullptr,
0, 0,
&si, &si,
&pi); &pi);

2
test/DefaultBtProgressInfoFileTest.cc
View File

@ -557,7 +557,7 @@ void DefaultBtProgressInfoFileTest::testUpdateFilename()
std::shared_ptr<DownloadContext> dctx std::shared_ptr<DownloadContext> dctx
(new DownloadContext(1024, 81920, A2_TEST_DIR"/file1")); (new DownloadContext(1024, 81920, A2_TEST_DIR"/file1"));
DefaultBtProgressInfoFile infoFile(dctx, std::shared_ptr<MockPieceStorage>(), 0); DefaultBtProgressInfoFile infoFile(dctx, std::shared_ptr<MockPieceStorage>(), nullptr);
#ifdef ENABLE_BITTORRENT #ifdef ENABLE_BITTORRENT
infoFile.setBtRuntime(btRuntime_); infoFile.setBtRuntime(btRuntime_);
infoFile.setPeerStorage(peerStorage_); infoFile.setPeerStorage(peerStorage_);

4
test/GZipDecoder.cc
View File

@ -40,7 +40,7 @@ namespace aria2 {
const std::string GZipDecoder::NAME("GZipDecoder"); const std::string GZipDecoder::NAME("GZipDecoder");
GZipDecoder::GZipDecoder():strm_(0), finished_(false) {} GZipDecoder::GZipDecoder():strm_(nullptr), finished_(false) {}
GZipDecoder::~GZipDecoder() GZipDecoder::~GZipDecoder()
{ {
@ -69,7 +69,7 @@ void GZipDecoder::release()
if(strm_) { if(strm_) {
inflateEnd(strm_); inflateEnd(strm_);
delete strm_; delete strm_;
strm_ = 0; strm_ = nullptr;
} }
} }

2
test/GrowSegmentTest.cc
View File

@ -37,7 +37,7 @@ void GrowSegmentTest::testClear()
GrowSegment segment(std::shared_ptr<Piece>(new Piece())); GrowSegment segment(std::shared_ptr<Piece>(new Piece()));
segment.updateWrittenLength(32*1024); segment.updateWrittenLength(32*1024);
CPPUNIT_ASSERT_EQUAL(32*1024, segment.getWrittenLength()); CPPUNIT_ASSERT_EQUAL(32*1024, segment.getWrittenLength());
segment.clear(0); segment.clear(nullptr);
CPPUNIT_ASSERT_EQUAL(0, segment.getWrittenLength()); CPPUNIT_ASSERT_EQUAL(0, segment.getWrittenLength());
} }

2
test/IndexedListTest.cc
View File

@ -229,7 +229,7 @@ void IndexedListTest::testGet()
int b = 1; int b = 1;
list.push_back(123, &a); list.push_back(123, &a);
list.push_back(1, &b); list.push_back(1, &b);
CPPUNIT_ASSERT_EQUAL((int*)0, list.get(1000)); CPPUNIT_ASSERT_EQUAL((int*)nullptr, list.get(1000));
CPPUNIT_ASSERT_EQUAL(&a, list.get(123)); CPPUNIT_ASSERT_EQUAL(&a, list.get(123));
} }

2
test/MultiDiskAdaptorTest.cc
View File

@ -270,7 +270,7 @@ void MultiDiskAdaptorTest::testResetDiskWriterEntries()
void readFile(const std::string& filename, char* buf, int bufLength) { void readFile(const std::string& filename, char* buf, int bufLength) {
FILE* f = fopen(filename.c_str(), "r"); FILE* f = fopen(filename.c_str(), "r");
if(f == NULL) { if(f == nullptr) {
CPPUNIT_FAIL(strerror(errno)); CPPUNIT_FAIL(strerror(errno));
} }
int retval = fread(buf, bufLength, 1, f); int retval = fread(buf, bufLength, 1, f);

2
test/RpcMethodTest.cc
View File

@ -684,7 +684,7 @@ void RpcMethodTest::testChangeGlobalOption_withNotAllowedOption()
void RpcMethodTest::testNoSuchMethod() void RpcMethodTest::testNoSuchMethod()
{ {
NoSuchMethodRpcMethod m; NoSuchMethodRpcMethod m;
auto res = m.execute(createReq("make.hamburger"), 0); auto res = m.execute(createReq("make.hamburger"), nullptr);
CPPUNIT_ASSERT_EQUAL(1, res.code); CPPUNIT_ASSERT_EQUAL(1, res.code);
CPPUNIT_ASSERT_EQUAL(std::string("No such method: make.hamburger"), CPPUNIT_ASSERT_EQUAL(std::string("No such method: make.hamburger"),
getString(downcast<Dict>(res.param), "faultString")); getString(downcast<Dict>(res.param), "faultString"));

2
test/SegmentTest.cc
View File

@ -68,7 +68,7 @@ void SegmentTest::testClear()
PiecedSegment s(16*1024*10, p); PiecedSegment s(16*1024*10, p);
s.updateWrittenLength(16*1024*10); s.updateWrittenLength(16*1024*10);
CPPUNIT_ASSERT_EQUAL(16*1024*10, s.getWrittenLength()); CPPUNIT_ASSERT_EQUAL(16*1024*10, s.getWrittenLength());
s.clear(0); s.clear(nullptr);
CPPUNIT_ASSERT_EQUAL(0, s.getWrittenLength()); CPPUNIT_ASSERT_EQUAL(0, s.getWrittenLength());
} }

4
test/SocketCoreTest.cc
View File

@ -87,7 +87,7 @@ void SocketCoreTest::testInetNtop()
{ {
std::string s = "192.168.0.1"; std::string s = "192.168.0.1";
addrinfo* res; addrinfo* res;
CPPUNIT_ASSERT_EQUAL(0, callGetaddrinfo(&res, s.c_str(), 0, AF_INET, CPPUNIT_ASSERT_EQUAL(0, callGetaddrinfo(&res, s.c_str(), nullptr, AF_INET,
SOCK_STREAM, 0, 0)); SOCK_STREAM, 0, 0));
std::unique_ptr<addrinfo, decltype(&freeaddrinfo)> resDeleter std::unique_ptr<addrinfo, decltype(&freeaddrinfo)> resDeleter
(res, freeaddrinfo); (res, freeaddrinfo);
@ -100,7 +100,7 @@ void SocketCoreTest::testInetNtop()
{ {
std::string s = "2001:db8::2:1"; std::string s = "2001:db8::2:1";
addrinfo* res; addrinfo* res;
CPPUNIT_ASSERT_EQUAL(0, callGetaddrinfo(&res, s.c_str(), 0, AF_INET6, CPPUNIT_ASSERT_EQUAL(0, callGetaddrinfo(&res, s.c_str(), nullptr, AF_INET6,
SOCK_STREAM, 0, 0)); SOCK_STREAM, 0, 0));
std::unique_ptr<addrinfo, decltype(&freeaddrinfo)> resDeleter std::unique_ptr<addrinfo, decltype(&freeaddrinfo)> resDeleter
(res, freeaddrinfo); (res, freeaddrinfo);

2
test/TimeTest.cc
View File

@ -113,7 +113,7 @@ void TimeTest::testToHTTPDate()
void TimeTest::testElapsed() void TimeTest::testElapsed()
{ {
struct timeval now; struct timeval now;
gettimeofday(&now, 0); gettimeofday(&now, nullptr);
{ {
struct timeval tv = now; struct timeval tv = now;
CPPUNIT_ASSERT(!Time(tv).elapsed(1)); CPPUNIT_ASSERT(!Time(tv).elapsed(1));

44
test/UriSplitTest.cc
View File

@ -391,28 +391,28 @@ void UriSplitTest::testUriSplit()
void UriSplitTest::testUriSplit_fail() void UriSplitTest::testUriSplit_fail()
{ {
CPPUNIT_ASSERT_EQUAL(-1, uri_split(NULL, "")); CPPUNIT_ASSERT_EQUAL(-1, uri_split(nullptr, ""));
CPPUNIT_ASSERT_EQUAL(-1, uri_split(NULL, "h")); CPPUNIT_ASSERT_EQUAL(-1, uri_split(nullptr, "h"));
CPPUNIT_ASSERT_EQUAL(-1, uri_split(NULL, "http:")); CPPUNIT_ASSERT_EQUAL(-1, uri_split(nullptr, "http:"));
CPPUNIT_ASSERT_EQUAL(-1, uri_split(NULL, "http:a")); CPPUNIT_ASSERT_EQUAL(-1, uri_split(nullptr, "http:a"));
CPPUNIT_ASSERT_EQUAL(-1, uri_split(NULL, "http:/")); CPPUNIT_ASSERT_EQUAL(-1, uri_split(nullptr, "http:/"));
CPPUNIT_ASSERT_EQUAL(-1, uri_split(NULL, "http://")); CPPUNIT_ASSERT_EQUAL(-1, uri_split(nullptr, "http://"));
CPPUNIT_ASSERT_EQUAL(-1, uri_split(NULL, "http:/a")); CPPUNIT_ASSERT_EQUAL(-1, uri_split(nullptr, "http:/a"));
CPPUNIT_ASSERT_EQUAL(-1, uri_split(NULL, "http://:host")); CPPUNIT_ASSERT_EQUAL(-1, uri_split(nullptr, "http://:host"));
CPPUNIT_ASSERT_EQUAL(-1, uri_split(NULL, "http://@user@host")); CPPUNIT_ASSERT_EQUAL(-1, uri_split(nullptr, "http://@user@host"));
CPPUNIT_ASSERT_EQUAL(-1, uri_split(NULL, "http://user:")); CPPUNIT_ASSERT_EQUAL(-1, uri_split(nullptr, "http://user:"));
CPPUNIT_ASSERT_EQUAL(-1, uri_split(NULL, "http://user:pass")); CPPUNIT_ASSERT_EQUAL(-1, uri_split(nullptr, "http://user:pass"));
CPPUNIT_ASSERT_EQUAL(-1, uri_split(NULL, "http://user:65536")); CPPUNIT_ASSERT_EQUAL(-1, uri_split(nullptr, "http://user:65536"));
CPPUNIT_ASSERT_EQUAL(-1, uri_split(NULL, "http://user:pass?")); CPPUNIT_ASSERT_EQUAL(-1, uri_split(nullptr, "http://user:pass?"));
CPPUNIT_ASSERT_EQUAL(-1, uri_split(NULL, "http://user:pass@host:65536")); CPPUNIT_ASSERT_EQUAL(-1, uri_split(nullptr, "http://user:pass@host:65536"));
CPPUNIT_ASSERT_EQUAL(-1, uri_split(NULL, "http://user:pass@host:x")); CPPUNIT_ASSERT_EQUAL(-1, uri_split(nullptr, "http://user:pass@host:x"));
CPPUNIT_ASSERT_EQUAL(-1, uri_split(NULL, "http://user:pass@host:80x")); CPPUNIT_ASSERT_EQUAL(-1, uri_split(nullptr, "http://user:pass@host:80x"));
CPPUNIT_ASSERT_EQUAL(-1, uri_split(NULL, "http://user@")); CPPUNIT_ASSERT_EQUAL(-1, uri_split(nullptr, "http://user@"));
CPPUNIT_ASSERT_EQUAL(-1, uri_split(NULL, "http://[]")); CPPUNIT_ASSERT_EQUAL(-1, uri_split(nullptr, "http://[]"));
CPPUNIT_ASSERT_EQUAL(-1, uri_split(NULL, "http://[::")); CPPUNIT_ASSERT_EQUAL(-1, uri_split(nullptr, "http://[::"));
CPPUNIT_ASSERT_EQUAL(-1, uri_split(NULL, "http://user[::1]")); CPPUNIT_ASSERT_EQUAL(-1, uri_split(nullptr, "http://user[::1]"));
CPPUNIT_ASSERT_EQUAL(-1, uri_split(NULL, "http://user[::1]x")); CPPUNIT_ASSERT_EQUAL(-1, uri_split(nullptr, "http://user[::1]x"));
CPPUNIT_ASSERT_EQUAL(-1, uri_split(NULL, "http://user:pass[::1]")); CPPUNIT_ASSERT_EQUAL(-1, uri_split(nullptr, "http://user:pass[::1]"));
} }
} // namespace aria2 } // namespace aria2