| commit | d29167516f999858a7e2609ab8b290bdd69273a4 | [log] [tgz] |
|---|---|---|
| author | Yi Kong <yikong@google.com> | Thu Jul 26 17:44:27 2018 -0700 |
| committer | Yi Kong <yikong@google.com> | Mon Jul 30 08:41:16 2018 +0000 |
| tree | 51a86f8fb26454b38c961dca67de62f72c22fd36 | |
| parent | 53b02f78bd5330bcf50eab88c7279cdb475505ee [diff] [blame] |
Modernize codebase by replacing NULL with nullptr Fixes -Wzero-as-null-pointer-constant warning. Test: m Bug: 68236239 Change-Id: I41cd58617d6df6de7942a541fb6dc9519c70bef0 Merged-In: I41cd58617d6df6de7942a541fb6dc9519c70bef0
diff --git a/keystore/keyblob_utils.cpp b/keystore/keyblob_utils.cpp index 3616822..6c2fac9 100644 --- a/keystore/keyblob_utils.cpp +++ b/keystore/keyblob_utils.cpp
@@ -48,7 +48,7 @@ uint8_t* add_softkey_header(uint8_t* key_blob, size_t key_blob_length) { if (key_blob_length < sizeof(SOFT_KEY_MAGIC)) { - return NULL; + return nullptr; } memcpy(key_blob, SOFT_KEY_MAGIC, sizeof(SOFT_KEY_MAGIC));