aboutsummaryrefslogtreecommitdiff
path: root/user-notification.c
diff options
context:
space:
mode:
authorDaniel Eklöf <daniel@ekloef.se>2021-11-14 16:56:24 +0000
committerDaniel Eklöf <daniel@ekloef.se>2021-11-14 16:56:24 +0000
commitef862bd747cdf3dcebf86ee801e17aff3976ffe8 (patch)
treec5313deb8e2c6e072983731394bacd541873638f /user-notification.c
parentconfig: remove options that were deprecated in 1.8.x (diff)
parentuser-notification: config: various small cleanups (diff)
Merge branch 'user-notification-cleanup'
Diffstat (limited to 'user-notification.c')
-rw-r--r--user-notification.c34
1 files changed, 5 insertions, 29 deletions
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 <stdio.h>
#include <stdarg.h>
+#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);
}