michaelh/zephyr
1
0
Fork 0
Code Releases Activity

Bluetooth: Fix not using log_strdup() for bt_uuid_str()

Browse source 
The string returned by bt_uuid_str() is not in ROM so log_strdup()
must be used on it. This also eliminates the following kind of warning
messages: "<err> log: argument 3 in log message "%s: start_handle
0x%04x end_handle 0x%04x type %s" missing log_strdup()."

Signed-off-by: Johan Hedberg <johan.hedberg@intel.com>
This commit is contained in:
Johan Hedberg 2019-06-13 20:55:04 +03:00 • committed by Johan Hedberg
commit 46ea1df2ec
2 changed files with 6 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

7
include/bluetooth/uuid.h
View file

@ -471,7 +471,10 @@ int bt_uuid_cmp(const struct bt_uuid *u1, const struct bt_uuid *u2);
*/ */
void bt_uuid_to_str(const struct bt_uuid *uuid, char *str, size_t len); void bt_uuid_to_str(const struct bt_uuid *uuid, char *str, size_t len);
/** @brief Convert Bluetooth UUID to string in place. const char *bt_uuid_str_real(const struct bt_uuid *uuid);
/** @def bt_uuid_str
* @brief Convert Bluetooth UUID to string in place.
* *
* Converts Bluetooth UUID to string in place. UUID has to be in 16 bits or * Converts Bluetooth UUID to string in place. UUID has to be in 16 bits or
* 128 bits format. * 128 bits format.
@ -480,7 +483,7 @@ void bt_uuid_to_str(const struct bt_uuid *uuid, char *str, size_t len);
* *
* @return String representation of the UUID given * @return String representation of the UUID given
*/ */
const char *bt_uuid_str(const struct bt_uuid *uuid); #define bt_uuid_str(_uuid) log_strdup(bt_uuid_str_real(_uuid))
#else #else
static inline void bt_uuid_to_str(const struct bt_uuid *uuid, char *str, static inline void bt_uuid_to_str(const struct bt_uuid *uuid, char *str,
size_t len) size_t len)

2
subsys/bluetooth/host/uuid.c
View file

@ -110,7 +110,7 @@ void bt_uuid_to_str(const struct bt_uuid *uuid, char *str, size_t len)
} }
} }
const char *bt_uuid_str(const struct bt_uuid *uuid) const char *bt_uuid_str_real(const struct bt_uuid *uuid)
{ {
static char str[37]; static char str[37];