[PATCH] Fix build with ./configure-bootstrap

[PATCH] Fix build with ./configure-bootstrap

[Stefan Seyfried]

hciops.c: In function ‘hciops_exit’:
hciops.c:728: error: call to function ‘btd_adapter_cleanup_ops’
              without a real prototype
---
 plugins/hciops.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/plugins/hciops.c b/plugins/hciops.c
index 659f754..6baed76 100644
--- a/plugins/hciops.c
+++ b/plugins/hciops.c
@@ -725,7 +725,7 @@ static int hciops_init(void)
 }
 static void hciops_exit(void)
 {
-	btd_adapter_cleanup_ops(&hci_ops);
+	btd_adapter_cleanup_ops();
 }
 
 BLUETOOTH_PLUGIN_DEFINE(hciops, VERSION,
-- 
1.6.3.2

Re: [PATCH] Fix build with ./configure-bootstrap

[Marcel Holtmann]

Hi Stefan,

> hciops.c: In function ‘hciops_exit’:
> hciops.c:728: error: call to function ‘btd_adapter_cleanup_ops’
>               without a real prototype
> ---
>  plugins/hciops.c |    2 +-
>  1 files changed, 1 insertions(+), 1 deletions(-)
> 
> diff --git a/plugins/hciops.c b/plugins/hciops.c
> index 659f754..6baed76 100644
> --- a/plugins/hciops.c
> +++ b/plugins/hciops.c
> @@ -725,7 +725,7 @@ static int hciops_init(void)
>  }
>  static void hciops_exit(void)
>  {
> -	btd_adapter_cleanup_ops(&hci_ops);
> +	btd_adapter_cleanup_ops();
>  }
>  
>  BLUETOOTH_PLUGIN_DEFINE(hciops, VERSION,

the subject is not matching the patch and I have no idea what is going
on here. I leave this to Johan or Alok to look at.

Regards

Marcel

Re: [PATCH] Fix build with ./configure-bootstrap

[Stefan Seyfried]

On Tue, 07 Jul 2009 10:21:52 -0700
Marcel Holtmann <marcel@holtmann.org> wrote:

> Hi Stefan,
> 
> > hciops.c: In function ‘hciops_exit’:
> > hciops.c:728: error: call to function ‘btd_adapter_cleanup_ops’
> >               without a real prototype
> > ---
> >  plugins/hciops.c |    2 +-
> >  1 files changed, 1 insertions(+), 1 deletions(-)
> > 
> > diff --git a/plugins/hciops.c b/plugins/hciops.c
> > index 659f754..6baed76 100644
> > --- a/plugins/hciops.c
> > +++ b/plugins/hciops.c
> > @@ -725,7 +725,7 @@ static int hciops_init(void)
> >  }
> >  static void hciops_exit(void)
> >  {
> > -	btd_adapter_cleanup_ops(&hci_ops);
> > +	btd_adapter_cleanup_ops();
> >  }
> >  
> >  BLUETOOTH_PLUGIN_DEFINE(hciops, VERSION,
> 
> the subject is not matching the patch and I have no idea what is going
> on here. I leave this to Johan or Alok to look at.

The build fails, because of this warning:

make[3]: Entering directory `/local/seife/src/git-repos/bluez-git/plugins'
  CC     libbuiltin_la-service.lo
  CC     libbuiltin_la-hciops.lo
cc1: warnings being treated as errors
hciops.c: In function ‘hciops_exit’:
hciops.c:728: error: call to function ‘btd_adapter_cleanup_ops’ without a real prototype
../src/adapter.h:174: note: ‘btd_adapter_cleanup_ops’ was declared here

The hci_ops are not used by btd_adapter_cleanup_ops (it takes no
parameter), so I guessed that the above would be a valid fix.

It is certainly a good idea to have this reviewed by someone who
actually knows the code (I don't ;)

Best regards,

	Stefan
-- 
Stefan Seyfried
R&D Preload Department             |              "Any ideas, John?"
SUSE LINUX Products GmbH, Nürnberg | "Well, surrounding them's out."

This footer brought to you by insane German lawmakers:
SUSE Linux Products GmbH, GF: Markus Rex, HRB 16746 (AG Nürnberg)

Re: [PATCH] Fix build with ./configure-bootstrap

[Marcel Holtmann]

Hi Stefan,

> > > hciops.c: In function ‘hciops_exit’:
> > > hciops.c:728: error: call to function ‘btd_adapter_cleanup_ops’
> > >               without a real prototype
> > > ---
> > >  plugins/hciops.c |    2 +-
> > >  1 files changed, 1 insertions(+), 1 deletions(-)
> > > 
> > > diff --git a/plugins/hciops.c b/plugins/hciops.c
> > > index 659f754..6baed76 100644
> > > --- a/plugins/hciops.c
> > > +++ b/plugins/hciops.c
> > > @@ -725,7 +725,7 @@ static int hciops_init(void)
> > >  }
> > >  static void hciops_exit(void)
> > >  {
> > > -	btd_adapter_cleanup_ops(&hci_ops);
> > > +	btd_adapter_cleanup_ops();
> > >  }
> > >  
> > >  BLUETOOTH_PLUGIN_DEFINE(hciops, VERSION,
> > 
> > the subject is not matching the patch and I have no idea what is going
> > on here. I leave this to Johan or Alok to look at.
> 
> The build fails, because of this warning:
> 
> make[3]: Entering directory `/local/seife/src/git-repos/bluez-git/plugins'
>   CC     libbuiltin_la-service.lo
>   CC     libbuiltin_la-hciops.lo
> cc1: warnings being treated as errors
> hciops.c: In function ‘hciops_exit’:
> hciops.c:728: error: call to function ‘btd_adapter_cleanup_ops’ without a real prototype
> ../src/adapter.h:174: note: ‘btd_adapter_cleanup_ops’ was declared here
> 
> The hci_ops are not used by btd_adapter_cleanup_ops (it takes no
> parameter), so I guessed that the above would be a valid fix.
> 
> It is certainly a good idea to have this reviewed by someone who
> actually knows the code (I don't ;)

we fixed it now with bluez-4.45 release, but your patch was actually
wrong. The problems with the prototype with no argument list. Bad C
programming and bad that it slipped through our review.

Regards

Marcel