summaryrefslogtreecommitdiffstats
path: root/runtime/jdwp/jdwp_expand_buf.cc
diff options
context:
space:
mode:
authorSebastien Hertz <shertz@google.com>2014-10-22 10:57:10 +0200
committerSebastien Hertz <shertz@google.com>2014-12-17 09:38:28 +0100
commit7d95565c84d91ae5dcec4b89728ada208633de0c (patch)
tree3d45e97f3ca520a07c5005974b092e10fee0a433 /runtime/jdwp/jdwp_expand_buf.cc
parentf610c0597e001cb1043aa4074afe25ae79a800e3 (diff)
downloadandroid_art-7d95565c84d91ae5dcec4b89728ada208633de0c.tar.gz
android_art-7d95565c84d91ae5dcec4b89728ada208633de0c.tar.bz2
android_art-7d95565c84d91ae5dcec4b89728ada208633de0c.zip
Cleanup JDWP event matching
* Use std::vector for the event match list. * Make event reporting methods void since result is never used. * Use nullptr keyword instead of NULL. Change-Id: Icd6f47e46cefc2cc63325df00037cd4b6a475259
Diffstat (limited to 'runtime/jdwp/jdwp_expand_buf.cc')
-rw-r--r--runtime/jdwp/jdwp_expand_buf.cc4
1 files changed, 2 insertions, 2 deletions
diff --git a/runtime/jdwp/jdwp_expand_buf.cc b/runtime/jdwp/jdwp_expand_buf.cc
index 0a64f28e11..cc85cdd72a 100644
--- a/runtime/jdwp/jdwp_expand_buf.cc
+++ b/runtime/jdwp/jdwp_expand_buf.cc
@@ -57,7 +57,7 @@ ExpandBuf* expandBufAlloc() {
* Free a JdwpBuf and associated storage.
*/
void expandBufFree(ExpandBuf* pBuf) {
- if (pBuf == NULL) {
+ if (pBuf == nullptr) {
return;
}
@@ -93,7 +93,7 @@ static void ensureSpace(ExpandBuf* pBuf, int newCount) {
}
uint8_t* newPtr = reinterpret_cast<uint8_t*>(realloc(pBuf->storage, pBuf->maxLen));
- if (newPtr == NULL) {
+ if (newPtr == nullptr) {
LOG(FATAL) << "realloc(" << pBuf->maxLen << ") failed";
}