From 2dc99e0da5723aca5c520a2fc5f9b2fca0441eba Mon Sep 17 00:00:00 2001 From: Bartosz Golaszewski Date: Thu, 23 Feb 2017 15:25:15 +0100 Subject: [PATCH] tests: remove xcasprintf() There's only one user and we already removed xasprintf() which was no longer used after introducing udev polling. Remove it for simplicity. Signed-off-by: Bartosz Golaszewski --- tests/unit/gpiod-unit.c | 26 ++++++-------------------- 1 file changed, 6 insertions(+), 20 deletions(-) diff --git a/tests/unit/gpiod-unit.c b/tests/unit/gpiod-unit.c index 5512ae4..f525055 100644 --- a/tests/unit/gpiod-unit.c +++ b/tests/unit/gpiod-unit.c @@ -118,22 +118,6 @@ static char * xstrdup(const char *str) return ret; } -static GU_PRINTF(2, 3) char * xcasprintf(size_t *count, const char *fmt, ...) -{ - int status; - va_list va; - char *ret; - - va_start(va, fmt); - status = vasprintf(&ret, fmt, va); - if (status < 0) - die_perr("asprintf"); - va_end(va); - - *count = status; - return ret; -} - static void check_chip_index(unsigned int index) { if (index >= globals.test_ctx.num_chips) @@ -246,7 +230,7 @@ static void check_gpio_mockup(void) static void test_load_module(struct gu_chip_descr *descr) { char *modarg, *tmp_modarg; - size_t modarg_len, count; + size_t modarg_len; char **line_sizes; unsigned int i; int status; @@ -255,9 +239,11 @@ static void test_load_module(struct gu_chip_descr *descr) modarg_len = strlen("gpio_mockup_ranges="); for (i = 0; i < descr->num_chips; i++) { - line_sizes[i] = xcasprintf(&count, "-1,%u,", - descr->num_lines[i]); - modarg_len += count; + status = asprintf(&line_sizes[i], + "-1,%u,", descr->num_lines[i]); + if (status < 0) + die_perr("asprintf"); + modarg_len += status; } modarg = xzalloc(modarg_len + 1); -- 2.30.2