diff options
| -rw-r--r-- | src/output/fifo_plugin.c | 12 | ||||
| -rw-r--r-- | src/output/null_plugin.c | 3 |
2 files changed, 8 insertions, 7 deletions
diff --git a/src/output/fifo_plugin.c b/src/output/fifo_plugin.c index b15f5288e..efadc8ff6 100644 --- a/src/output/fifo_plugin.c +++ b/src/output/fifo_plugin.c @@ -25,6 +25,9 @@ #include <sys/types.h> #include <sys/stat.h> #include <fcntl.h> +#include <errno.h> +#include <string.h> +#include <unistd.h> #undef G_LOG_DOMAIN #define G_LOG_DOMAIN "fifo" @@ -43,26 +46,25 @@ static FifoData *newFifoData(void) { FifoData *ret; - ret = xmalloc(sizeof(FifoData)); + ret = g_new(FifoData, 1); ret->path = NULL; ret->input = -1; ret->output = -1; ret->created = 0; ret->timer = NULL; - + return ret; } static void freeFifoData(FifoData *fd) { - if (fd->path) - free(fd->path); + g_free(fd->path); if (fd->timer) timer_free(fd->timer); - free(fd); + g_free(fd); } static void removeFifo(FifoData *fd) diff --git a/src/output/null_plugin.c b/src/output/null_plugin.c index dd85e6389..d821d6aee 100644 --- a/src/output/null_plugin.c +++ b/src/output/null_plugin.c @@ -18,7 +18,6 @@ #include "../output_api.h" #include "../timer.h" -#include "../utils.h" #include <glib.h> @@ -31,7 +30,7 @@ null_initDriver(G_GNUC_UNUSED struct audio_output *audioOutput, G_GNUC_UNUSED const struct audio_format *audio_format, G_GNUC_UNUSED ConfigParam *param) { - struct null_data *nd = xmalloc(sizeof(*nd)); + struct null_data *nd = g_new(struct null_data, 1); nd->timer = NULL; return nd; } |