From f2b932960ea702e46f1ecae2f9fbd5a563b94839 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marco=20Trevisan=20=28Trevi=C3=B1o=29?= Date: Wed, 20 Nov 2019 13:41:35 +0100 Subject: [PATCH] lib: Use g_new0 rather than g_malloc0 Port some of the g_malloc0 users to g_new0. --- libfprint/drivers/vfs5011.c | 3 +-- libfprint/fpi-assembling.c | 2 +- libfprint/fpi-ssm.c | 2 +- 3 files changed, 3 insertions(+), 4 deletions(-) diff --git a/libfprint/drivers/vfs5011.c b/libfprint/drivers/vfs5011.c index 301a1d64..0bcf8549 100644 --- a/libfprint/drivers/vfs5011.c +++ b/libfprint/drivers/vfs5011.c @@ -806,8 +806,7 @@ dev_open (FpImageDevice *dev) FpDeviceVfs5011 *self; self = FPI_DEVICE_VFS5011 (dev); - self->capture_buffer = - (unsigned char *) g_malloc0 (CAPTURE_LINES * VFS5011_LINE_SIZE); + self->capture_buffer = g_new0 (unsigned char, CAPTURE_LINES * VFS5011_LINE_SIZE); if (!g_usb_device_claim_interface (fpi_device_get_usb_device (FP_DEVICE (dev)), 0, 0, &error)) { diff --git a/libfprint/fpi-assembling.c b/libfprint/fpi-assembling.c index 634a50f0..75291c09 100644 --- a/libfprint/fpi-assembling.c +++ b/libfprint/fpi-assembling.c @@ -426,7 +426,7 @@ fpi_assemble_lines (struct fpi_line_asmbl_ctx *ctx, GSList *row1, *row2; float y = 0.0; int line_ind = 0; - int *offsets = (int *) g_malloc0 ((num_lines / 2) * sizeof (int)); + int *offsets = g_new0 (int, num_lines / 2); unsigned char *output = g_malloc0 (ctx->line_width * ctx->max_height); FpImage *img; diff --git a/libfprint/fpi-ssm.c b/libfprint/fpi-ssm.c index 2fb25650..c9da3c8d 100644 --- a/libfprint/fpi-ssm.c +++ b/libfprint/fpi-ssm.c @@ -110,7 +110,7 @@ fpi_ssm_new (FpDevice *dev, BUG_ON (nr_states < 1); - machine = g_malloc0 (sizeof (*machine)); + machine = g_new0 (FpiSsm, 1); machine->handler = handler; machine->nr_states = nr_states; machine->dev = dev;