From: Florian Weimer <fweimer@redhat.com>
To: libc-alpha@sourceware.org
Subject: [PATCH 2/3] login: Rework hidden prototypes for __setutent, __utmpname, __endutent
Date: Mon, 21 Jun 2021 13:46:54 +0200 [thread overview]
Message-ID: <16b3eb68f21df794606763f02c37bd114d3e0b74.1624275874.git.fweimer@redhat.com> (raw)
In-Reply-To: <cover.1624275874.git.fweimer@redhat.com>
Replace attribute_hidden with a regular combination of
libc_hidden_proto and libc_hidden_def.
---
include/utmp.h | 9 ++++++---
login/getutent_r.c | 2 ++
login/utmpname.c | 1 +
3 files changed, 9 insertions(+), 3 deletions(-)
diff --git a/include/utmp.h b/include/utmp.h
index 374184e9b2..e8162bd08d 100644
--- a/include/utmp.h
+++ b/include/utmp.h
@@ -6,11 +6,14 @@
/* Now define the internal interfaces. */
extern void __updwtmp (const char *__wtmp_file, const struct utmp *__utmp);
libc_hidden_proto (__updwtmp)
-extern int __utmpname (const char *__file) attribute_hidden;
+extern int __utmpname (const char *__file);
+libc_hidden_proto (__utmpname)
extern struct utmp *__getutent (void);
libc_hidden_proto (__getutent)
-extern void __setutent (void) attribute_hidden;
-extern void __endutent (void) attribute_hidden;
+extern void __setutent (void);
+libc_hidden_proto (__setutent)
+extern void __endutent (void);
+libc_hidden_proto (__endutent)
extern struct utmp *__getutid (const struct utmp *__id);
libc_hidden_proto (__getutid)
extern struct utmp *__getutline (const struct utmp *__line);
diff --git a/login/getutent_r.c b/login/getutent_r.c
index 0af48acec8..58d3d5fd0c 100644
--- a/login/getutent_r.c
+++ b/login/getutent_r.c
@@ -36,6 +36,7 @@ __setutent (void)
__libc_lock_unlock (__libc_utmp_lock);
}
+libc_hidden_def (__setutent)
weak_alias (__setutent, setutent)
@@ -82,4 +83,5 @@ __endutent (void)
__libc_lock_unlock (__libc_utmp_lock);
}
+libc_hidden_def (__endutent)
weak_alias (__endutent, endutent)
diff --git a/login/utmpname.c b/login/utmpname.c
index c85c27fe68..a645445e8a 100644
--- a/login/utmpname.c
+++ b/login/utmpname.c
@@ -72,4 +72,5 @@ done:
__libc_lock_unlock (__libc_utmp_lock);
return result;
}
+libc_hidden_def (__utmpname)
weak_alias (__utmpname, utmpname)
--
2.31.1
next prev parent reply other threads:[~2021-06-21 11:46 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-06-21 11:46 [PATCH 0/3] Move libutil into libc Florian Weimer
2021-06-21 11:46 ` [PATCH 1/3] login: Hidden prototypes for _getpt, __ptsname_r, grantpt, unlockpt Florian Weimer
2021-06-29 13:21 ` Adhemerval Zanella
2021-06-21 11:46 ` Florian Weimer [this message]
2021-06-29 13:22 ` [PATCH 2/3] login: Rework hidden prototypes for __setutent, __utmpname, __endutent Adhemerval Zanella
2021-06-21 11:47 ` [PATCH 3/3] login: Move libutil into libc Florian Weimer
2021-06-29 14:09 ` Adhemerval Zanella
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=16b3eb68f21df794606763f02c37bd114d3e0b74.1624275874.git.fweimer@redhat.com \
--to=fweimer@redhat.com \
--cc=libc-alpha@sourceware.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).