summaryrefslogtreecommitdiff
path: root/lib
diff options
context:
space:
mode:
authorJim Meyering <jim@meyering.net>2000-10-26 08:08:06 +0000
committerJim Meyering <jim@meyering.net>2000-10-26 08:08:06 +0000
commit49ac3c60d066f995d43f367fa527d5c353b3a3ae (patch)
tree480dc9846d5e7c27a9e16a009f08c09719e1c48c /lib
parentd9ef180ae565f4addae9635ff917ab49f681bb71 (diff)
downloadcoreutils-49ac3c60d066f995d43f367fa527d5c353b3a3ae.tar.xz
Update from libc.
Diffstat (limited to 'lib')
-rw-r--r--lib/strftime.c9
1 files changed, 5 insertions, 4 deletions
diff --git a/lib/strftime.c b/lib/strftime.c
index c3b214860..e10a87c78 100644
--- a/lib/strftime.c
+++ b/lib/strftime.c
@@ -457,8 +457,7 @@ static CHAR_T const month_name[][10] =
return _strftime_copytm (s, maxsize, format, &tmcopy ut_argument);
}
# undef my_strftime
-# define my_strftime(S, Maxsize, Format, Tp) \
- _strftime_copytm (S, Maxsize, Format, Tp)
+# define my_strftime _strftime_copytm
#endif
@@ -801,8 +800,10 @@ my_strftime (s, maxsize, format, tp ut_argument)
subformat:
{
CHAR_T *old_start = p;
- size_t len = my_strftime (NULL, (size_t) -1, subfmt, tp);
- add (len, my_strftime (p, maxsize - i, subfmt, tp));
+ size_t len = my_strftime (NULL, (size_t) -1, subfmt,
+ tp ut_argument);
+ add (len, my_strftime (p, maxsize - i, subfmt,
+ tp ut_argument));
if (to_uppcase)
while (old_start < p)