From 2fc09a9cdd1ad25bc7c53a23d5301eb952e1ce3d Mon Sep 17 00:00:00 2001 From: Daniel Mack Date: Wed, 29 Jul 2015 20:25:57 +0200 Subject: tree-wide: use free_and_strdup() Use free_and_strdup() where appropriate and replace equivalent, open-coded versions. --- src/sysusers/sysusers.c | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) (limited to 'src/sysusers') diff --git a/src/sysusers/sysusers.c b/src/sysusers/sysusers.c index d7ba482834..b3fa29b84c 100644 --- a/src/sysusers/sysusers.c +++ b/src/sysusers/sysusers.c @@ -891,8 +891,10 @@ static int add_user(Item *i) { i->uid = p->pw_uid; i->uid_set = true; - free(i->description); - i->description = strdup(p->pw_gecos); + r = free_and_strdup(&i->description, p->pw_gecos); + if (r < 0) + return log_oom(); + return 0; } if (!IN_SET(errno, 0, ENOENT)) @@ -1149,9 +1151,8 @@ static int process_item(Item *i) { } if (i->gid_path) { - free(j->gid_path); - j->gid_path = strdup(i->gid_path); - if (!j->gid_path) + r = free_and_strdup(&j->gid_path, i->gid_path); + if (r < 0) return log_oom(); } -- cgit v1.2.3-54-g00ecf