[make-initrd] [PATCH v2] ueventd: Change interface rd_asprintf_or_die

[Alexey Gladkov <gladkov.alexey@gmail.com>]

There is no need to pass a pointer for the result to rd_asprintf_or_die
because the error check is inside the function and the function cannot
fail.

Signed-off-by: Alexey Gladkov <gladkov.alexey@gmail.com>
---
 datasrc/libinitramfs/memory.c     |  7 ++++---
 datasrc/libinitramfs/rd/memory.h  |  7 ++++---
 datasrc/ueventd/queue-processor.c | 10 +++-------
 datasrc/ueventd/ueventd.c         | 11 +++--------
 4 files changed, 14 insertions(+), 21 deletions(-)

diff --git a/datasrc/libinitramfs/memory.c b/datasrc/libinitramfs/memory.c
index ea0d292e..cd6a19f7 100644
--- a/datasrc/libinitramfs/memory.c
+++ b/datasrc/libinitramfs/memory.c
@@ -27,14 +27,15 @@ void *rd_malloc_or_die(size_t size)
 	return r;
 }
 
-char *rd_asprintf_or_die(char **ptr, const char *fmt, ...)
+char *rd_asprintf_or_die(const char *fmt, ...)
 {
+	char *ptr;
 	va_list arg;
 
 	va_start(arg, fmt);
-	if (vasprintf(ptr, fmt, arg) < 0)
+	if (vasprintf(&ptr, fmt, arg) < 0)
 		rd_fatal("vasprintf: %m");
 	va_end(arg);
 
-	return *ptr;
+	return ptr;
 }
diff --git a/datasrc/libinitramfs/rd/memory.h b/datasrc/libinitramfs/rd/memory.h
index 415e8394..b8c82909 100644
--- a/datasrc/libinitramfs/rd/memory.h
+++ b/datasrc/libinitramfs/rd/memory.h
@@ -5,8 +5,9 @@
 
 #include <stdlib.h>
 
-void *rd_calloc_or_die(size_t nmemb, size_t size)          __attribute__((alloc_size(1, 2)));
-void *rd_malloc_or_die(size_t size)                        __attribute__((alloc_size(1)));
-char *rd_asprintf_or_die(char **ptr, const char *fmt, ...) __attribute__((nonnull(1, 2),format(printf, 2, 3)));
+void *rd_calloc_or_die(size_t nmemb, size_t size)          __attribute__((alloc_size(1, 2),returns_nonnull,warn_unused_result));
+void *rd_malloc_or_die(size_t size)                        __attribute__((alloc_size(1),returns_nonnull,warn_unused_result));
+char *rd_asprintf_or_die(const char *fmt, ...)             __attribute__((nonnull(1),format(printf, 1, 2),returns_nonnull,
+                                                                          warn_unused_result));
 
 #endif /* __RD_MEMORY_H__ */
diff --git a/datasrc/ueventd/queue-processor.c b/datasrc/ueventd/queue-processor.c
index 908492a7..8b13a1c9 100644
--- a/datasrc/ueventd/queue-processor.c
+++ b/datasrc/ueventd/queue-processor.c
@@ -92,15 +92,11 @@ void process_events(struct watch *queue)
 {
 	rd_info("%s: session=%lu: processing events", queue->q_name, session);
 
-	char *numenv;
-
-	rd_asprintf_or_die(&numenv, "SESSION=%lu", session);
+	char *numenv = rd_asprintf_or_die("SESSION=%lu", session);
 	putenv(numenv);
 
-	char *srcdir, *dstdir;
-
-	rd_asprintf_or_die(&srcdir, "%s/%s", filter_dir, queue->q_name);
-	rd_asprintf_or_die(&dstdir, "%s/%s", uevent_dir, queue->q_name);
+	char *srcdir = rd_asprintf_or_die("%s/%s", filter_dir, queue->q_name);
+	char *dstdir = rd_asprintf_or_die("%s/%s", uevent_dir, queue->q_name);
 
 	move_files(srcdir, dstdir);
 
diff --git a/datasrc/ueventd/ueventd.c b/datasrc/ueventd/ueventd.c
index c2c23ba3..414c3f51 100644
--- a/datasrc/ueventd/ueventd.c
+++ b/datasrc/ueventd/ueventd.c
@@ -99,9 +99,8 @@ int watch_path(int inotifyfd, const char *dir, const char *name, uint32_t mask,
 {
 	struct stat st;
 	struct watch *new = NULL;
-	char *path;
 
-	rd_asprintf_or_die(&path, "%s/%s", dir, name);
+	char *path = rd_asprintf_or_die("%s/%s", dir, name);
 
 	int wfd = add_queue_dir(inotifyfd, path, mask);
 	if (wfd < 0) {
@@ -173,9 +172,7 @@ int unwatch_path(int inotifyfd, ino_t ino)
 
 void watch_pauses(int inotifyfd)
 {
-	char *path;
-
-	rd_asprintf_or_die(&path, "%s/queue/pause", uevent_confdb);
+	char *path = rd_asprintf_or_die("%s/queue/pause", uevent_confdb);
 
 	if (watch_path(inotifyfd, path, ".", EV_PAUSE_MASK, F_PAUSE_DIR) < 0)
 		exit(EXIT_FAILURE);
@@ -187,9 +184,7 @@ void apply_pause(void)
 {
 	struct watch *p;
 	DIR *dir;
-	char *path;
-
-	rd_asprintf_or_die(&path, "%s/queue/pause", uevent_confdb);
+	char *path = rd_asprintf_or_die("%s/queue/pause", uevent_confdb);
 
 	dir = xopendir(path);
 	pause_all = 0;
-- 
2.33.8