generic-library/bionic
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

am 856e6a35: am 89ca3c5a: Merge "Sync with upstream OpenBSD wcsftime.c."

Browse Source 
* commit '856e6a35bf350a7923c1e283c1816572adfbe1dd':
  Sync with upstream OpenBSD wcsftime.c.
This commit is contained in:
Elliott Hughes 2014-05-06 20:25:31 +00:00 committed by Android Git Automerger
commit 33ba85cbd6
1 changed files with 1 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
libc/upstream-openbsd/lib/libc/time/wcsftime.c
View File

@ -1,4 +1,4 @@
/* $OpenBSD: wcsftime.c,v 1.2 2013/01/20 20:29:02 millert Exp $ */ /* $OpenBSD: wcsftime.c,v 1.3 2014/05/06 15:49:45 tedu Exp $ */
#include "private.h" #include "private.h"
/* /*
@ -110,10 +110,6 @@ static wchar_t * _yconv(int, int, int, int, wchar_t *, const wchar_t *);
extern char * tzname[]; extern char * tzname[];
#ifndef YEAR_2000_NAME
#define YEAR_2000_NAME "CHECK_STRFTIME_FORMATS_FOR_TWO_DIGIT_YEARS"
#endif /* !defined YEAR_2000_NAME */
#define IN_NONE 0 #define IN_NONE 0
#define IN_SOME 1 #define IN_SOME 1
#define IN_THIS 2 #define IN_THIS 2
@ -129,22 +125,6 @@ wcsftime(wchar_t *__restrict s, size_t maxsize,
tzset(); tzset();
warn = IN_NONE; warn = IN_NONE;
p = _fmt(((format == NULL) ? L"%c" : format), t, s, s + maxsize, &warn); p = _fmt(((format == NULL) ? L"%c" : format), t, s, s + maxsize, &warn);
#ifndef NO_RUN_TIME_WARNINGS_ABOUT_YEAR_2000_PROBLEMS_THANK_YOU
if (warn != IN_NONE && getenv(YEAR_2000_NAME) != NULL) {
(void) fprintf(stderr, "\n");
if (format == NULL)
(void) fprintf(stderr, "NULL strftime format ");
else (void) fwprintf(stderr, "strftime format \"%ls\" ",
format);
(void) fprintf(stderr, "yields only two digits of years in ");
if (warn == IN_SOME)
(void) fprintf(stderr, "some locales");
else if (warn == IN_THIS)
(void) fprintf(stderr, "the current locale");
else (void) fprintf(stderr, "all locales");
(void) fprintf(stderr, "\n");
}
#endif /* !defined NO_RUN_TIME_WARNINGS_ABOUT_YEAR_2000_PROBLEMS_THANK_YOU */
if (p == s + maxsize) { if (p == s + maxsize) {
if (maxsize > 0) if (maxsize > 0)
s[maxsize - 1] = '\0'; s[maxsize - 1] = '\0';