lib/utmp.c: Indent nested preprocessor conditionals
Reviewed-by: Iker Pedrosa <ipedrosa@redhat.com> Signed-off-by: Alejandro Colomar <alx@kernel.org>
This commit is contained in:
+6
-6
@@ -209,7 +209,7 @@ get_session_host(char **out)
|
|||||||
* Some systems already have updwtmpx(). Others
|
* Some systems already have updwtmpx(). Others
|
||||||
* don't, so we re-implement these functions if necessary.
|
* don't, so we re-implement these functions if necessary.
|
||||||
*/
|
*/
|
||||||
#ifndef HAVE_UPDWTMPX
|
# ifndef HAVE_UPDWTMPX
|
||||||
static void
|
static void
|
||||||
updwtmpx(const char *filename, const struct utmpx *ut)
|
updwtmpx(const char *filename, const struct utmpx *ut)
|
||||||
{
|
{
|
||||||
@@ -221,7 +221,7 @@ updwtmpx(const char *filename, const struct utmpx *ut)
|
|||||||
close (fd);
|
close (fd);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
#endif /* ! HAVE_UPDWTMPX */
|
# endif /* ! HAVE_UPDWTMPX */
|
||||||
#endif /* ! USE_PAM */
|
#endif /* ! USE_PAM */
|
||||||
|
|
||||||
|
|
||||||
@@ -306,13 +306,13 @@ prepare_utmp(const char *name, const char *line, const char *host,
|
|||||||
if (info->ai_family == AF_INET) {
|
if (info->ai_family == AF_INET) {
|
||||||
struct sockaddr_in *sa =
|
struct sockaddr_in *sa =
|
||||||
(struct sockaddr_in *) info->ai_addr;
|
(struct sockaddr_in *) info->ai_addr;
|
||||||
#ifdef HAVE_STRUCT_UTMP_UT_ADDR
|
# ifdef HAVE_STRUCT_UTMP_UT_ADDR
|
||||||
memcpy (&(utent->ut_addr),
|
memcpy (&(utent->ut_addr),
|
||||||
&(sa->sin_addr),
|
&(sa->sin_addr),
|
||||||
MIN (sizeof (utent->ut_addr),
|
MIN (sizeof (utent->ut_addr),
|
||||||
sizeof (sa->sin_addr)));
|
sizeof (sa->sin_addr)));
|
||||||
#endif /* HAVE_STRUCT_UTMP_UT_ADDR */
|
# endif /* HAVE_STRUCT_UTMP_UT_ADDR */
|
||||||
#ifdef HAVE_STRUCT_UTMP_UT_ADDR_V6
|
# ifdef HAVE_STRUCT_UTMP_UT_ADDR_V6
|
||||||
memcpy (utent->ut_addr_v6,
|
memcpy (utent->ut_addr_v6,
|
||||||
&(sa->sin_addr),
|
&(sa->sin_addr),
|
||||||
MIN (sizeof (utent->ut_addr_v6),
|
MIN (sizeof (utent->ut_addr_v6),
|
||||||
@@ -324,7 +324,7 @@ prepare_utmp(const char *name, const char *line, const char *host,
|
|||||||
&(sa->sin6_addr),
|
&(sa->sin6_addr),
|
||||||
MIN (sizeof (utent->ut_addr_v6),
|
MIN (sizeof (utent->ut_addr_v6),
|
||||||
sizeof (sa->sin6_addr)));
|
sizeof (sa->sin6_addr)));
|
||||||
#endif /* HAVE_STRUCT_UTMP_UT_ADDR_V6 */
|
# endif /* HAVE_STRUCT_UTMP_UT_ADDR_V6 */
|
||||||
}
|
}
|
||||||
freeaddrinfo (info);
|
freeaddrinfo (info);
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user