2014-06-09 12:08:18

by Andrei Emeltchenko

Subject: [PATCH 1/2] HDP: Fix checking always constant error code

From: Andrei Emeltchenko <[email protected]>

sdp_set_access_protos() always returns 0, there is no sense to check for
error code. Fixes compile warnings.
---
profiles/health/hdp_util.c | 8 ++------
1 file changed, 2 insertions(+), 6 deletions(-)

diff --git a/profiles/health/hdp_util.c b/profiles/health/hdp_util.c
index 58770b5..ff427a6 100644
--- a/profiles/health/hdp_util.c
+++ b/profiles/health/hdp_util.c
@@ -362,7 +362,7 @@ static gboolean set_sdp_services_uuid(sdp_record_t *record, HdpRole role)
static gboolean register_service_protocols(struct hdp_adapter *adapter,
sdp_record_t *sdp_record)
{
- gboolean ret;
+ gboolean ret = TRUE;
uuid_t l2cap_uuid, mcap_c_uuid;
sdp_list_t *l2cap_list, *proto_list = NULL, *mcap_list = NULL;
sdp_list_t *access_proto_list = NULL;
@@ -425,11 +425,7 @@ static gboolean register_service_protocols(struct hdp_adapter *adapter,
goto end;
}

- if (sdp_set_access_protos(sdp_record, access_proto_list) < 0) {
- ret = FALSE;
- goto end;
- }
- ret = TRUE;
+ sdp_set_access_protos(sdp_record, access_proto_list);

end:
if (l2cap_list != NULL)
--
1.8.3.2

2014-06-12 11:33:42

by Marcel Holtmann

Subject: Re: [PATCH 2/2] SDP: Make sdp_set_access_protos() return void

Hi Andrei,

>>> Function always returns 0, so there is sense to make it void function.
>>> ---
>>> lib/sdp.c | 6 +-----
>>> lib/sdp_lib.h | 2 +-
>>> 2 files changed, 2 insertions(+), 6 deletions(-)
>>>
>>> diff --git a/lib/sdp.c b/lib/sdp.c
>>> index e5e4622..da26b78 100644
>>> --- a/lib/sdp.c
>>> +++ b/lib/sdp.c
>>> @@ -2380,10 +2380,8 @@ static sdp_data_t *access_proto_to_dataseq(sdp_record_t *rec, sdp_list_t *proto)
>>> *
>>> * This function replaces the existing sdp_access_proto_t
>>> * structure (if any) with the new one specified.
>>> - *
>>> - * returns 0 if successful or -1 if there is a failure.
>>> */
>>> -int sdp_set_access_protos(sdp_record_t *rec, const sdp_list_t *ap)
>>> +void sdp_set_access_protos(sdp_record_t *rec, const sdp_list_t *ap)
>>
>> if this is libbluetooth API, then we can not do that. I am not planning to break that API.
>>
>
> Is libbluetooth API internal API and only used in our code?

it is a public API. Can be enabled with --enable-library in configure.

Regards

Marcel

2014-06-12 10:49:37

by Andrei Emeltchenko

Subject: Re: [PATCH 2/2] SDP: Make sdp_set_access_protos() return void

Hi Marcel,

On Mon, Jun 09, 2014 at 02:10:24PM +0200, Marcel Holtmann wrote:
> Hi Andrei,
>
> > Function always returns 0, so there is sense to make it void function.
> > ---
> > lib/sdp.c | 6 +-----
> > lib/sdp_lib.h | 2 +-
> > 2 files changed, 2 insertions(+), 6 deletions(-)
> >
> > diff --git a/lib/sdp.c b/lib/sdp.c
> > index e5e4622..da26b78 100644
> > --- a/lib/sdp.c
> > +++ b/lib/sdp.c
> > @@ -2380,10 +2380,8 @@ static sdp_data_t *access_proto_to_dataseq(sdp_record_t *rec, sdp_list_t *proto)
> > *
> > * This function replaces the existing sdp_access_proto_t
> > * structure (if any) with the new one specified.
> > - *
> > - * returns 0 if successful or -1 if there is a failure.
> > */
> > -int sdp_set_access_protos(sdp_record_t *rec, const sdp_list_t *ap)
> > +void sdp_set_access_protos(sdp_record_t *rec, const sdp_list_t *ap)
>
> if this is libbluetooth API, then we can not do that. I am not planning to break that API.
>

Is libbluetooth API internal API and only used in our code?

Best regards
Andrei Emeltchenko

2014-06-09 12:10:24

by Marcel Holtmann

Subject: Re: [PATCH 2/2] SDP: Make sdp_set_access_protos() return void

Hi Andrei,

> Function always returns 0, so there is sense to make it void function.
> ---
> lib/sdp.c | 6 +-----
> lib/sdp_lib.h | 2 +-
> 2 files changed, 2 insertions(+), 6 deletions(-)
>
> diff --git a/lib/sdp.c b/lib/sdp.c
> index e5e4622..da26b78 100644
> --- a/lib/sdp.c
> +++ b/lib/sdp.c
> @@ -2380,10 +2380,8 @@ static sdp_data_t *access_proto_to_dataseq(sdp_record_t *rec, sdp_list_t *proto)
> *
> * This function replaces the existing sdp_access_proto_t
> * structure (if any) with the new one specified.
> - *
> - * returns 0 if successful or -1 if there is a failure.
> */
> -int sdp_set_access_protos(sdp_record_t *rec, const sdp_list_t *ap)
> +void sdp_set_access_protos(sdp_record_t *rec, const sdp_list_t *ap)

if this is libbluetooth API, then we can not do that. I am not planning to break that API.

Regards

Marcel

2014-06-09 12:08:19

by Andrei Emeltchenko

Subject: [PATCH 2/2] SDP: Make sdp_set_access_protos() return void

From: Andrei Emeltchenko <[email protected]>

Function always returns 0, so there is sense to make it void function.
---
lib/sdp.c | 6 +-----
lib/sdp_lib.h | 2 +-
2 files changed, 2 insertions(+), 6 deletions(-)

diff --git a/lib/sdp.c b/lib/sdp.c
index e5e4622..da26b78 100644
--- a/lib/sdp.c
+++ b/lib/sdp.c
@@ -2380,10 +2380,8 @@ static sdp_data_t *access_proto_to_dataseq(sdp_record_t *rec, sdp_list_t *proto)
*
* This function replaces the existing sdp_access_proto_t
* structure (if any) with the new one specified.
- *
- * returns 0 if successful or -1 if there is a failure.
*/
-int sdp_set_access_protos(sdp_record_t *rec, const sdp_list_t *ap)
+void sdp_set_access_protos(sdp_record_t *rec, const sdp_list_t *ap)
{
const sdp_list_t *p;
sdp_data_t *protos = NULL;
@@ -2394,8 +2392,6 @@ int sdp_set_access_protos(sdp_record_t *rec, const sdp_list_t *ap)
}

sdp_attr_add(rec, SDP_ATTR_PROTO_DESC_LIST, protos);
-
- return 0;
}

int sdp_set_add_access_protos(sdp_record_t *rec, const sdp_list_t *ap)
diff --git a/lib/sdp_lib.h b/lib/sdp_lib.h
index 3ded393..72922d6 100644
--- a/lib/sdp_lib.h
+++ b/lib/sdp_lib.h
@@ -231,7 +231,7 @@ static inline int sdp_set_browse_groups(sdp_record_t *rec, sdp_list_t *seq)
/*
* Set the access protocols of the record to those specified in proto
*/
-int sdp_set_access_protos(sdp_record_t *rec, const sdp_list_t *proto);
+void sdp_set_access_protos(sdp_record_t *rec, const sdp_list_t *proto);

/*
* Set the additional access protocols of the record to those specified in proto
--
1.8.3.2