Correct jack_controller_create and jackctl_server_create.
git-svn-id: http://subversion.jackaudio.org/jack/jack2/trunk/jackmp@2829 0c269be4-1314-0410-8aa9-9f06e86f4224
This commit is contained in:
parent
6ad125e506
commit
15e1d6730a
|
@ -743,10 +743,13 @@ EXPORT jackctl_server_t * jackctl_server_create()
|
|||
|
||||
if (!jackctl_internals_load(server_ptr))
|
||||
{
|
||||
goto fail_free_parameters;
|
||||
goto fail_free_drivers;
|
||||
}
|
||||
|
||||
return server_ptr;
|
||||
|
||||
fail_free_drivers:
|
||||
jackctl_server_free_drivers(server_ptr);
|
||||
|
||||
fail_free_parameters:
|
||||
jackctl_server_free_parameters(server_ptr);
|
||||
|
|
|
@ -96,7 +96,7 @@ def build(bld):
|
|||
]
|
||||
includes.append('../linux')
|
||||
uselib.append('RT')
|
||||
uselib.append('DL')
|
||||
uselib.append('DL')
|
||||
|
||||
if bld.env()['IS_MACOSX']:
|
||||
common_libsources += [
|
||||
|
|
|
@ -298,7 +298,7 @@ jack_controller_create(
|
|||
if (controller_ptr->internal_names == NULL)
|
||||
{
|
||||
jack_error("Ran out of memory trying to allocate internals names array");
|
||||
goto fail_destroy_server;
|
||||
goto fail_free_driver_names_array;
|
||||
}
|
||||
|
||||
internal_name_target = controller_ptr->internal_names;
|
||||
|
@ -320,17 +320,19 @@ jack_controller_create(
|
|||
&controller_ptr->dbus_descriptor))
|
||||
{
|
||||
jack_error("Ran out of memory trying to register D-Bus object path");
|
||||
goto fail_free_names_array;
|
||||
goto fail_free_internal_names_array;
|
||||
}
|
||||
|
||||
jack_controller_settings_load(controller_ptr);
|
||||
|
||||
return controller_ptr;
|
||||
|
||||
fail_free_names_array:
|
||||
free(controller_ptr->driver_names);
|
||||
fail_free_internal_names_array:
|
||||
free(controller_ptr->internal_names);
|
||||
|
||||
fail_free_driver_names_array:
|
||||
free(controller_ptr->driver_names);
|
||||
|
||||
fail_destroy_server:
|
||||
jackctl_server_destroy(controller_ptr->server);
|
||||
|
||||
|
|
Loading…
Reference in New Issue