2018-02-23 13:40:09

by Szymon Janc

Subject: [PATCH 1/2] shared/btp: Fix return type in btp_send

This function returns bool.
---
src/shared/btp.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/shared/btp.c b/src/shared/btp.c
index 77622671c..555dabc39 100644
--- a/src/shared/btp.c
+++ b/src/shared/btp.c
@@ -297,7 +297,7 @@ bool btp_send(struct btp *btp, uint8_t service, uint8_t opcode, uint8_t index,
len = sizeof(*hdr) + length;
hdr = l_malloc(len);
if (!hdr)
- return NULL;
+ return false;

hdr->service = service;
hdr->opcode = opcode;
--
2.14.3

2018-02-26 13:00:46

by Szymon Janc

Subject: Re: [PATCH 1/2] shared/btp: Fix return type in btp_send

On Friday, 23 February 2018 14:40:09 CET Szymon Janc wrote:
> This function returns bool.
> ---
> src/shared/btp.c | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/src/shared/btp.c b/src/shared/btp.c
> index 77622671c..555dabc39 100644
> --- a/src/shared/btp.c
> +++ b/src/shared/btp.c
> @@ -297,7 +297,7 @@ bool btp_send(struct btp *btp, uint8_t service, uint8_t
> opcode, uint8_t index, len = sizeof(*hdr) + length;
> hdr = l_malloc(len);
> if (!hdr)
> - return NULL;
> + return false;
>
> hdr->service = service;
> hdr->opcode = opcode;

Applied.

--
pozdrawiam
Szymon Janc

2018-02-23 13:40:10

by Szymon Janc

Subject: [PATCH 2/2] shared/btp: Allow to call btp_send without valid btp

This allows to unconditionally call btp_send from code that generates
events eg when mapping those from D-Bus events.
---
src/shared/btp.c | 3 +++
1 file changed, 3 insertions(+)

diff --git a/src/shared/btp.c b/src/shared/btp.c
index 555dabc39..7eea241a2 100644
--- a/src/shared/btp.c
+++ b/src/shared/btp.c
@@ -294,6 +294,9 @@ bool btp_send(struct btp *btp, uint8_t service, uint8_t opcode, uint8_t index,
struct pending_message *msg;
size_t len;

+ if (!btp)
+ return false;
+
len = sizeof(*hdr) + length;
hdr = l_malloc(len);
if (!hdr)
--
2.14.3