*/: s/STRFTIME/strftime_a/

This name better reflects that it handles arrays, and doesn't shout.

Signed-off-by: Alejandro Colomar <alx@kernel.org>

diff --git a/lib/failure.c b/lib/failure.c
index 924c1925989f4122cbec14b924091a69ac837327..369b215abcadd646502bf6ee22847958f687ace3 100644 (file)
--- a/lib/failure.c
+++ b/lib/failure.c
@@ -252,7 +252,7 @@ void failprint (const struct faillog *fail)
        /*
         * Print all information we have.
         */
-       STRFTIME(lasttimeb, "%c", tp);
+       strftime_a(lasttimeb, "%c", tp);
 
        /*@-formatconst@*/
        (void) printf (ngettext ("%d failure since last login.\n"

diff --git a/lib/string/README b/lib/string/README
index 91355ed2794e8d6c4a24c8155b9a790404b2b60a..b946c8b3cda59990aabe4d4a60818a97ff421095 100644 (file)
--- a/lib/string/README
+++ b/lib/string/README
@@ -279,5 +279,5 @@ strsep/ - String separation
        (But the strings themselves are not duplicated.)
 
 strftime.h
-    STRFTIME()
+    strftime_a()
        Like strftime(3), but takes an array.

diff --git a/lib/string/strftime.h b/lib/string/strftime.h
index c06eb5c675c15e979212b017d721ed59a551e6ea..0c816d5352c23c0d07f07fcae71780830db1d43c 100644 (file)
--- a/lib/string/strftime.h
+++ b/lib/string/strftime.h
@@ -13,8 +13,8 @@
 #include "sizeof.h"
 
 
-// string format time
-#define STRFTIME(dst, fmt, tm)  strftime(dst, countof(dst), fmt, tm)
+// strftime_a - string format time array
+#define strftime_a(dst, fmt, tm)  strftime(dst, countof(dst), fmt, tm)
 
 
 #endif  // include guard

diff --git a/src/chage.c b/src/chage.c
index f2500736f04587bde319d5addf98405c9aa2333c..06b6600f8c64d3e843ad9edc3667a1ffb8f43b73 100644 (file)
--- a/src/chage.c
+++ b/src/chage.c
@@ -249,7 +249,7 @@ print_day_as_date(long day)
                return;
        }
 
-       if (STRFTIME(buf, iflg ? "%F" : "%b %d, %Y", &tm) == 0) {
+       if (strftime_a(buf, iflg ? "%F" : "%b %d, %Y", &tm) == 0) {
                puts(_("future"));
                return;
        }

diff --git a/src/faillog.c b/src/faillog.c
index f1a0dd1c6787695262104faebc3dc23493a04ba3..6bb93ae1256785c7fefa05e10006f67e3f9e9eda 100644 (file)
--- a/src/faillog.c
+++ b/src/faillog.c
@@ -173,7 +173,7 @@ static void print_one (/*@null@*/const struct passwd *pw, bool force)
                fprintf (stderr, "Cannot read time from faillog.\n");
                return;
        }
-       STRFTIME(ptime, "%D %H:%M:%S %z", tm);
+       strftime_a(ptime, "%D %H:%M:%S %z", tm);
        cp = ptime;
 
        printf ("%-9s   %5d    %5d   ",

diff --git a/src/lastlog.c b/src/lastlog.c
index dbdd859309b1e3e0b971e2388ce44d95c13e74af..46ccc165e6378792309645cc3cf62d83c174ce16 100644 (file)
--- a/src/lastlog.c
+++ b/src/lastlog.c
@@ -158,7 +158,7 @@ static void print_one (/*@null@*/const struct passwd *pw)
        if (tm == NULL) {
                cp = "(unknown)";
        } else {
-               STRFTIME(ptime, "%a %b %e %H:%M:%S %z %Y", tm);
+               strftime_a(ptime, "%a %b %e %H:%M:%S %z %Y", tm);
                cp = ptime;
        }
        if (ll.ll_time == (time_t) 0) {

diff --git a/src/login.c b/src/login.c
index 2fa9407484da3f7db86a2696957dcd2a962fc8da..4ccbc1224d026c591c60c238731249b5ebdeefa2 100644 (file)
--- a/src/login.c
+++ b/src/login.c
@@ -1197,7 +1197,7 @@ int main (int argc, char **argv)
                        struct tm  tm;
 
                        localtime_r(&ll_time, &tm);
-                       STRFTIME(ptime, "%a %b %e %H:%M:%S %z %Y", &tm);
+                       strftime_a(ptime, "%a %b %e %H:%M:%S %z %Y", &tm);
                        printf (_("Last login: %s on %s"),
                                ptime, ll.ll_line);
 #ifdef HAVE_LL_HOST            /* __linux__ || SUN4 */