diff options
Diffstat (limited to 'usr/src/lib')
| -rw-r--r-- | usr/src/lib/libc/port/gen/cftime.c | 6 | ||||
| -rw-r--r-- | usr/src/lib/libfru/libnvfru/nvfru.c | 4 | ||||
| -rw-r--r-- | usr/src/lib/print/libpapi-common/common/attribute.c | 6 |
3 files changed, 9 insertions, 7 deletions
diff --git a/usr/src/lib/libc/port/gen/cftime.c b/usr/src/lib/libc/port/gen/cftime.c index f4fa872da8..be0a67c75d 100644 --- a/usr/src/lib/libc/port/gen/cftime.c +++ b/usr/src/lib/libc/port/gen/cftime.c @@ -20,6 +20,8 @@ */ /* + * Copyright (c) 2014 Gary Mills + * * Copyright 2008 Sun Microsystems, Inc. All rights reserved. * Use is subject to license terms. */ @@ -27,8 +29,6 @@ /* Copyright (c) 1988 AT&T */ /* All Rights Reserved */ -#pragma ident "%Z%%M% %I% %E% SMI" - /* * This routine converts time as follows. The epoch is 0000 Jan 1 * 1970 GMT. The argument time is in seconds since then. The @@ -91,7 +91,7 @@ ascftime(char *buf, const char *format, const struct tm *tm) /* Set format string, if not already set */ if (format == NULL || *format == '\0') if (((format = getenv("CFTIME")) == 0) || *format == 0) - format = "%C"; + format = "%+"; return ((int)strftime(buf, LONG_MAX, format, tm)); } diff --git a/usr/src/lib/libfru/libnvfru/nvfru.c b/usr/src/lib/libfru/libnvfru/nvfru.c index 08aae7d56a..b5ed00ae4a 100644 --- a/usr/src/lib/libfru/libnvfru/nvfru.c +++ b/usr/src/lib/libfru/libnvfru/nvfru.c @@ -20,6 +20,8 @@ */ /* + * Copyright (c) 2014 Gary Mills + * * Copyright (c) 2009, 2010, Oracle and/or its affiliates. All rights reserved. */ @@ -73,7 +75,7 @@ convert_field(const uint8_t *field, const fru_regdef_t *def, const char *path, } (void) memcpy(&timefield, field, sizeof (timefield)); timefield = BE_32(timefield); - if (strftime(timestring, sizeof (timestring), "%C", + if (strftime(timestring, sizeof (timestring), "%c", localtime(&timefield)) == 0) { /* buffer too small */ return; diff --git a/usr/src/lib/print/libpapi-common/common/attribute.c b/usr/src/lib/print/libpapi-common/common/attribute.c index 244e54555d..76268c7591 100644 --- a/usr/src/lib/print/libpapi-common/common/attribute.c +++ b/usr/src/lib/print/libpapi-common/common/attribute.c @@ -20,6 +20,8 @@ */ /* + * Copyright (c) 2014 Gary Mills + * * Copyright 2008 Sun Microsystems, Inc. All rights reserved. * Use is subject to license terms. * @@ -27,8 +29,6 @@ /* $Id: attribute.c 157 2006-04-26 15:07:55Z ktou $ */ -#pragma ident "%Z%%M% %I% %E% SMI" - /*LINTLIBRARY*/ #include <stdio.h> @@ -957,7 +957,7 @@ papiAttributeToString(papi_attribute_t *attribute, char *delim, if (tm != NULL) { char string[64]; - strftime(string, sizeof (string), "%C", tm); + strftime(string, sizeof (string), "%c", tm); rc = strlcat(buffer, string, buflen); }} break; |