p/desktop-tools
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Bump liberty

Browse Source 
The bugfixes in the config parser are worth it.

I might have slightly overused cstr_set().
This commit is contained in:
Přemysl Eric Janouch
2020-10-19 19:52:48 +02:00
parent f79a8d38fb
commit a48c2cf4e5
6 changed files with 28 additions and 44 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
paswitch.c
View File

@@ -45,13 +45,6 @@
enum { PIPE_READ, PIPE_WRITE };
static void
cstr_set (char **s, char *new)
{
free (*s);
*s = new;
}
static void
log_message_custom (void *user_data, const char *quote, const char *fmt,
va_list ap)
@@ -79,8 +72,8 @@ struct port
static void
port_free (struct port *self)
{
free (self->name);
free (self->description);
cstr_set (&self->name, NULL);
cstr_set (&self->description, NULL);
}
// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
@@ -109,14 +102,14 @@ sink_new (void)
static void
sink_destroy (struct sink *self)
{
free (self->name);
free (self->description);
cstr_set (&self->name, NULL);
cstr_set (&self->description, NULL);
for (size_t i = 0; i < self->ports_len; i++)
port_free (self->ports + i);
free (self->ports);
free (self->port_active);
cstr_set (&self->port_active, NULL);
free (self);
}
@@ -185,7 +178,7 @@ app_context_free (struct app_context *self)
if (self->context)
pa_context_unref (self->context);
free (self->default_sink);
cstr_set (&self->default_sink, NULL);
LIST_FOR_EACH (struct sink, iter, self->sinks)
sink_destroy (iter);
LIST_FOR_EACH (struct sink_input, iter, self->inputs)