shaba/systemd
1
0
Fork 0
mirror of https://github.com/systemd/systemd.git synced 2025-02-01 09:47:35 +03:00
Code

basic/user-util: simplify variable declarations in fget{pw,gr}ent_sane()

Browse Source
This commit is contained in:
Zbigniew Jędrzejewski-Szmek 2022-10-03 11:50:16 +02:00
parent 59818f4381
commit 67f047a6f2
1 changed files with 8 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
src/basic/user-util.c
View File

@ -990,13 +990,11 @@ int putsgent_sane(const struct sgrp *sg, FILE *stream) {
#endif #endif
int fgetpwent_sane(FILE *stream, struct passwd **pw) { int fgetpwent_sane(FILE *stream, struct passwd **pw) {
struct passwd *p;
assert(pw);
assert(stream); assert(stream);
assert(pw);
errno = 0; errno = 0;
p = fgetpwent(stream); struct passwd *p = fgetpwent(stream);
if (!p && errno != ENOENT) if (!p && errno != ENOENT)
return errno_or_else(EIO); 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) { int fgetspent_sane(FILE *stream, struct spwd **sp) {
struct spwd *s;
assert(sp);
assert(stream); assert(stream);
assert(sp);
errno = 0; errno = 0;
s = fgetspent(stream); struct spwd *s = fgetspent(stream);
if (!s && errno != ENOENT) if (!s && errno != ENOENT)
return errno_or_else(EIO); 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) { int fgetgrent_sane(FILE *stream, struct group **gr) {
struct group *g;
assert(gr);
assert(stream); assert(stream);
assert(gr);
errno = 0; errno = 0;
g = fgetgrent(stream); struct group *g = fgetgrent(stream);
if (!g && errno != ENOENT) if (!g && errno != ENOENT)
return errno_or_else(EIO); return errno_or_else(EIO);
@ -1036,13 +1030,11 @@ int fgetgrent_sane(FILE *stream, struct group **gr) {
#if ENABLE_GSHADOW #if ENABLE_GSHADOW
int fgetsgent_sane(FILE *stream, struct sgrp **sg) { int fgetsgent_sane(FILE *stream, struct sgrp **sg) {
struct sgrp *s;
assert(sg);
assert(stream); assert(stream);
assert(sg);
errno = 0; errno = 0;
s = fgetsgent(stream); struct sgrp *s = fgetsgent(stream);
if (!s && errno != ENOENT) if (!s && errno != ENOENT)
return errno_or_else(EIO); return errno_or_else(EIO);