From: Sami Kerola <kerolasa@iki.fi>
Date: Thu, 12 Nov 2020 23:53:44 +0000 (+0000)
Subject: login: replace function like definitions with inline functions
X-Git-Tag: v2.37-rc1~254
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=79a8afeb8f7f48cdecebc59a5807b8f2ee07654f;p=thirdparty%2Futil-linux.git

login: replace function like definitions with inline functions

Signed-off-by: Sami Kerola <kerolasa@iki.fi>
---

diff --git a/login-utils/login.c b/login-utils/login.c
index 11d1afd493..499f070e9f 100644
--- a/login-utils/login.c
+++ b/login-utils/login.c
@@ -80,7 +80,6 @@
 
 #include "logindefs.h"
 
-#define is_pam_failure(_rc)	((_rc) != PAM_SUCCESS)
 
 #define LOGIN_MAX_TRIES        3
 #define LOGIN_EXIT_TIMEOUT     5
@@ -444,12 +443,15 @@ static void open_tty(const char *tty)
 		close(fd);
 }
 
-#define chown_err(_what, _uid, _gid) \
-		syslog(LOG_ERR, _("chown (%s, %lu, %lu) failed: %m"), \
-			(_what), (unsigned long) (_uid), (unsigned long) (_gid))
+static inline void chown_err(const char *what, uid_t uid, gid_t gid)
+{
+	syslog(LOG_ERR, _("chown (%s, %u, %u) failed: %m"), what, uid, gid);
+}
 
-#define chmod_err(_what, _mode) \
-		syslog(LOG_ERR, _("chmod (%s, %u) failed: %m"), (_what), (_mode))
+static inline void chmod_err(const char *what, mode_t mode)
+{
+	syslog(LOG_ERR, _("chmod (%s, %u) failed: %m"), what, mode);
+}
 
 static void chown_tty(struct login_context *cxt)
 {
@@ -841,6 +843,11 @@ static const char *loginpam_get_prompt(struct login_context *cxt)
 	return prompt;
 }
 
+static inline int is_pam_failure(int rc)
+{
+	return rc != PAM_SUCCESS;
+}
+
 static pam_handle_t *init_loginpam(struct login_context *cxt)
 {
 	pam_handle_t *pamh = NULL;