From f56506141cbf6391b0373108a2522ba771b25f4b Mon Sep 17 00:00:00 2001 From: =?utf8?q?Zbigniew=20J=C4=99drzejewski-Szmek?= Date: Thu, 19 Jun 2014 21:48:32 -0400 Subject: [PATCH 1/1] getty-generator: use strappenda Allocating on the stack should be fine for the fixed number of items. --- src/getty-generator/getty-generator.c | 20 +++++--------------- 1 file changed, 5 insertions(+), 15 deletions(-) diff --git a/src/getty-generator/getty-generator.c b/src/getty-generator/getty-generator.c index 6a4aa2c1d..35cd8589f 100644 --- a/src/getty-generator/getty-generator.c +++ b/src/getty-generator/getty-generator.c @@ -35,19 +35,14 @@ static const char *arg_dest = "/tmp"; static int add_symlink(const char *fservice, const char *tservice) { - _cleanup_free_ char *from = NULL, *to = NULL; + char *from, *to; int r; assert(fservice); assert(tservice); - from = strappend(SYSTEM_DATA_UNIT_PATH "/", fservice); - if (!from) - return log_oom(); - - to = strjoin(arg_dest,"/getty.target.wants/", tservice, NULL); - if (!to) - return log_oom(); + from = strappenda(SYSTEM_DATA_UNIT_PATH "/", fservice); + to = strappenda3(arg_dest, "/getty.target.wants/", tservice); mkdir_parents_label(to, 0755); @@ -221,14 +216,9 @@ int main(int argc, char *argv[]) { /* Automatically add in a serial getty on the first * virtualizer console */ NULSTR_FOREACH(j, virtualization_consoles) { - _cleanup_free_ char *p = NULL; - - p = strappend("/sys/class/tty/", j); - if (!p) { - log_oom(); - return EXIT_FAILURE; - } + char *p; + p = strappenda("/sys/class/tty/", j); if (access(p, F_OK) < 0) continue; -- 2.30.2