From 67f047a6f2e5966db9669cb5289b40ef444c3dcc Mon Sep 17 00:00:00 2001 From: =?utf8?q?Zbigniew=20J=C4=99drzejewski-Szmek?= Date: Mon, 3 Oct 2022 11:50:16 +0200 Subject: [PATCH] basic/user-util: simplify variable declarations in fget{pw,gr}ent_sane() --- src/basic/user-util.c | 24 ++++++++---------------- 1 file changed, 8 insertions(+), 16 deletions(-) diff --git a/src/basic/user-util.c b/src/basic/user-util.c index 80f9ff144b1..e2857b31027 100644 --- a/src/basic/user-util.c +++ b/src/basic/user-util.c @@ -990,13 +990,11 @@ int putsgent_sane(const struct sgrp *sg, FILE *stream) { #endif int fgetpwent_sane(FILE *stream, struct passwd **pw) { - struct passwd *p; - - assert(pw); assert(stream); + assert(pw); errno = 0; - p = fgetpwent(stream); + struct passwd *p = fgetpwent(stream); if (!p && errno != ENOENT) return errno_or_else(EIO); @@ -1005,13 +1003,11 @@ int fgetpwent_sane(FILE *stream, struct passwd **pw) { } int fgetspent_sane(FILE *stream, struct spwd **sp) { - struct spwd *s; - - assert(sp); assert(stream); + assert(sp); errno = 0; - s = fgetspent(stream); + struct spwd *s = fgetspent(stream); if (!s && errno != ENOENT) return errno_or_else(EIO); @@ -1020,13 +1016,11 @@ int fgetspent_sane(FILE *stream, struct spwd **sp) { } int fgetgrent_sane(FILE *stream, struct group **gr) { - struct group *g; - - assert(gr); assert(stream); + assert(gr); errno = 0; - g = fgetgrent(stream); + struct group *g = fgetgrent(stream); if (!g && errno != ENOENT) return errno_or_else(EIO); @@ -1036,13 +1030,11 @@ int fgetgrent_sane(FILE *stream, struct group **gr) { #if ENABLE_GSHADOW int fgetsgent_sane(FILE *stream, struct sgrp **sg) { - struct sgrp *s; - - assert(sg); assert(stream); + assert(sg); errno = 0; - s = fgetsgent(stream); + struct sgrp *s = fgetsgent(stream); if (!s && errno != ENOENT) return errno_or_else(EIO); -- 2.47.3