From: Alejandro Colomar <alx@kernel.org>
Date: Wed, 21 Dec 2022 17:44:06 +0000 (+0100)
Subject: Cosmetic fixes
X-Git-Tag: 4.14.0-rc1~252
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=b990b167d470ec5c6d4e63221f99aa36f8b19c21;p=thirdparty%2Fshadow.git

Cosmetic fixes

Previous commits, to keep readability of the diffs, left the code that
was previously wrapped by preprocessor coditionals untouched.  Apply
some minor cosmetic changes to merge it in the surrounding code.

Signed-off-by: Alejandro Colomar <alx@kernel.org>
---

diff --git a/libmisc/failure.c b/libmisc/failure.c
index fb4bcde39..30d7e433c 100644
--- a/libmisc/failure.c
+++ b/libmisc/failure.c
@@ -242,9 +242,7 @@ void failprint (const struct faillog *fail)
  *	maintains a record of all login failures.
  */
 
-void failtmp (const char *username,
-		     const struct utmp *failent
-    )
+void failtmp (const char *username, const struct utmp *failent)
 {
 	const char *ftmp;
 	int fd;
diff --git a/src/login.c b/src/login.c
index eb1b20c9f..116e2cb36 100644
--- a/src/login.c
+++ b/src/login.c
@@ -107,8 +107,7 @@ static /*@observer@*/const char *get_failent_user (/*@returned@*/const char *use
 static void update_utmp (const char *user,
                          const char *tty,
                          const char *host,
-                         /*@null@*/const struct utmp *utent
-			);
+                         /*@null@*/const struct utmp *utent);
 
 #ifndef USE_PAM
 static struct faillog faillog;
@@ -458,8 +457,7 @@ static /*@observer@*/const char *get_failent_user (/*@returned@*/const char *use
 static void update_utmp (const char *user,
                          const char *tty,
                          const char *host,
-                         /*@null@*/const struct utmp *utent
-			 )
+                         /*@null@*/const struct utmp *utent)
 {
 	struct utmp  *ut  = prepare_utmp  (user, tty, host, utent);
 
diff --git a/src/logoutd.c b/src/logoutd.c
index 76b93086d..a4735e0e7 100644
--- a/src/logoutd.c
+++ b/src/logoutd.c
@@ -175,8 +175,7 @@ int main (int argc, char **argv)
 		 * for login sessions will be checked to see if the user
 		 * is permitted to be signed on at this time.
 		 */
-		while ((ut = getutent ()) != NULL)
-		{
+		while ((ut = getutent ()) != NULL) {
 			if (ut->ut_type != USER_PROCESS) {
 				continue;
 			}