From 759bc8007b2834bdfa7497f8d34ae2e30dd8064b Mon Sep 17 00:00:00 2001 From: Craig Barnes Date: Sun, 14 Nov 2021 15:08:47 +0000 Subject: user-notification: config: various small cleanups * Rename user_notification_add() to user_notification_add_fmt() * Add new user_notification_add() helper function * Use xvasprintf() to replace user_notification_add_va() * Make better use of helper functions in config.c --- user-notification.c | 34 +++++----------------------------- 1 file changed, 5 insertions(+), 29 deletions(-) (limited to 'user-notification.c') diff --git a/user-notification.c b/user-notification.c index 497aa08c..6c1157d5 100644 --- a/user-notification.c +++ b/user-notification.c @@ -1,38 +1,14 @@ #include "user-notification.h" -#include #include +#include "xmalloc.h" -static bool -user_notification_add_va(user_notifications_t *notifications, - enum user_notification_kind kind, const char *fmt, - va_list ap) -{ - va_list ap2; - va_copy(ap2, ap); - int cnt = vsnprintf(NULL, 0, fmt, ap2); - va_end(ap2); - - if (cnt < 0) - return false; - - char *text = malloc(cnt + 1); - vsnprintf(text, cnt + 1, fmt, ap); - - struct user_notification not = { - .kind = kind, - .text = text, - }; - tll_push_back(*notifications, not); - return true; -} - -bool -user_notification_add(user_notifications_t *notifications, +void +user_notification_add_fmt(user_notifications_t *notifications, enum user_notification_kind kind, const char *fmt, ...) { va_list ap; va_start(ap, fmt); - bool ret = user_notification_add_va(notifications, kind, fmt, ap); + char *text = xvasprintf(fmt, ap); va_end(ap); - return ret; + user_notification_add(notifications, kind, text); } -- cgit v1.3