src/: Use DAY_TO_STR() instead of its pattern

Cc: Tobias Stoeckmann <tobias@stoeckmann.org>
Signed-off-by: Alejandro Colomar <alx@kernel.org>

diff --git a/src/chage.c b/src/chage.c
index 5788a190a6d8f77e02f1ac238ce84ffc8e761e4d..88e06cd3fe7633befdf26ce42bc56631376ed5d9 100644 (file)
--- a/src/chage.c
+++ b/src/chage.c
@@ -181,11 +181,10 @@ static int new_fields (void)
                return 0;
        }
 
-       if (-1 == lstchgdate || lstchgdate > LONG_MAX / DAY) {
-               strcpy (buf, "-1");
-       } else {
-               date_to_str (sizeof(buf), buf, lstchgdate * DAY);
-       }
+       if (-1 == lstchgdate || lstchgdate > LONG_MAX / DAY)
+               strcpy(buf, "-1");
+       else
+               DAY_TO_STR(buf, lstchgdate);
 
        change_field (buf, sizeof buf, _("Last Password Change (YYYY-MM-DD)"));
 
@@ -212,11 +211,10 @@ static int new_fields (void)
                return 0;
        }
 
-       if (-1 == expdate || LONG_MAX / DAY < expdate) {
-               strcpy (buf, "-1");
-       } else {
-               date_to_str (sizeof(buf), buf, expdate * DAY);
-       }
+       if (-1 == expdate || LONG_MAX / DAY < expdate)
+               strcpy(buf, "-1");
+       else
+               DAY_TO_STR(buf, expdate);
 
        change_field (buf, sizeof buf,
                      _("Account Expiration Date (YYYY-MM-DD)"));

diff --git a/src/passwd.c b/src/passwd.c
index 1b797892a977d1e6e6d73e6205852da4dc560391..ed92bc7c70a503e57a729047336c05e2c6365043 100644 (file)
--- a/src/passwd.c
+++ b/src/passwd.c
@@ -453,7 +453,7 @@ static void print_status (const struct passwd *pw)
 
        sp = prefix_getspnam (pw->pw_name); /* local, no need for xprefix_getspnam */
        if (NULL != sp) {
-               date_to_str (sizeof(date), date, sp->sp_lstchg * DAY),
+               DAY_TO_STR(date, sp->sp_lstchg),
                (void) printf ("%s %s %s %ld %ld %ld %ld\n",
                               pw->pw_name,
                               pw_status (sp->sp_pwdp),

diff --git a/src/usermod.c b/src/usermod.c
index 63fb996d1994044b06d24302ded16d3474d7c6a2..dff0487a7059e0ad024688c2138a35722df6e14a 100644 (file)
--- a/src/usermod.c
+++ b/src/usermod.c
@@ -586,8 +586,9 @@ static void new_spent (struct spwd *spent)
        if (eflg) {
                /* log dates rather than numbers of days. */
                char new_exp[16], old_exp[16];
-               date_to_str (sizeof(new_exp), new_exp, user_newexpire * DAY);
-               date_to_str (sizeof(old_exp), old_exp, user_expire * DAY);
+
+               DAY_TO_STR(new_exp, user_newexpire);
+               DAY_TO_STR(old_exp, user_expire);
 #ifdef WITH_AUDIT
                audit_logger (AUDIT_USER_CHAUTHTOK, Prog,
                              "changing expiration date",