Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 6738e723 authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Silence error by assigning \0 instead of NULL" into main am: 40a69f2b 

Original change: https://android-review.googlesource.com/c/platform/packages/modules/Bluetooth/+/3163283



Change-Id: I4bb967bff12abd4628235c415283f8d0360aa1ff
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents a29fcf34 40a69f2b

system/stack/include/bt_name.h

+1 −1
Original line number Diff line number Diff line
@@ -26,7 +26,7 @@ typedef uint8_t BD_NAME[BD_NAME_LEN + 1]; /* Device name */ 


inline constexpr BD_NAME kBtmBdNameEmpty = {};

constexpr size_t kBdNameLength = static_cast<size_t>(BD_NAME_LEN);

constexpr uint8_t kBdNameDelim = (uint8_t)NULL;

constexpr uint8_t kBdNameDelim = (uint8_t)'\0';



inline size_t bd_name_copy(BD_NAME bd_name_dest, const BD_NAME bd_name_src) {

  return strlcpy(reinterpret_cast<char*>(bd_name_dest), reinterpret_cast<const char*>(bd_name_src),