]> git.ipfire.org Git - thirdparty/shadow.git/commitdiff
lib/utmp.c: Indent nested preprocessor conditionals
authorAlejandro Colomar <alx@kernel.org>
Tue, 20 Feb 2024 18:06:49 +0000 (19:06 +0100)
committerAlejandro Colomar <alx@kernel.org>
Wed, 21 Feb 2024 17:15:59 +0000 (18:15 +0100)
Reviewed-by: Iker Pedrosa <ipedrosa@redhat.com>
Signed-off-by: Alejandro Colomar <alx@kernel.org>
Cherry-picked-from: f4ea04b72861 ("lib/utmp.c: Indent nested preprocessor conditionals")
[alx: This is needed by 1af6b68cbeb9 ("lib/utmp.c: Use the appropriate autotools macros for struct utmpx")]
Signed-off-by: Alejandro Colomar <alx@kernel.org>
lib/utmp.c

index 7c603e6cc272f21a0bebd15d098fb2ff77484f79..ab2ee7ba8c7adb432fdd871a3a09d7a4eae7932b 100644 (file)
@@ -194,7 +194,7 @@ get_session_host(char **out)
  * Some systems already have updwtmpx().  Others
  * don't, so we re-implement these functions if necessary.
  */
-#ifndef HAVE_UPDWTMPX
+# ifndef HAVE_UPDWTMPX
 static void
 updwtmpx(const char *filename, const struct utmpx *ut)
 {
@@ -206,7 +206,7 @@ updwtmpx(const char *filename, const struct utmpx *ut)
                close (fd);
        }
 }
-#endif                         /* ! HAVE_UPDWTMPX */
+# endif                                /* ! HAVE_UPDWTMPX */
 #endif                         /* ! USE_PAM */
 
 
@@ -292,13 +292,13 @@ prepare_utmp(const char *name, const char *line, const char *host,
                        if (info->ai_family == AF_INET) {
                                struct sockaddr_in *sa =
                                        (struct sockaddr_in *) info->ai_addr;
-#ifdef HAVE_STRUCT_UTMP_UT_ADDR
+# ifdef HAVE_STRUCT_UTMP_UT_ADDR
                                memcpy (&(utent->ut_addr),
                                        &(sa->sin_addr),
                                        MIN (sizeof (utent->ut_addr),
                                             sizeof (sa->sin_addr)));
-#endif                         /* HAVE_STRUCT_UTMP_UT_ADDR */
-#ifdef HAVE_STRUCT_UTMP_UT_ADDR_V6
+# endif                                /* HAVE_STRUCT_UTMP_UT_ADDR */
+# ifdef HAVE_STRUCT_UTMP_UT_ADDR_V6
                                memcpy (utent->ut_addr_v6,
                                        &(sa->sin_addr),
                                        MIN (sizeof (utent->ut_addr_v6),
@@ -310,7 +310,7 @@ prepare_utmp(const char *name, const char *line, const char *host,
                                        &(sa->sin6_addr),
                                        MIN (sizeof (utent->ut_addr_v6),
                                             sizeof (sa->sin6_addr)));
-#endif                         /* HAVE_STRUCT_UTMP_UT_ADDR_V6 */
+# endif                                /* HAVE_STRUCT_UTMP_UT_ADDR_V6 */
                        }
                        freeaddrinfo (info);
                }