diff options
| author | Keith M Wesolowski <wesolows@foobazco.org> | 2014-01-08 18:01:43 +0000 |
|---|---|---|
| committer | Keith M Wesolowski <wesolows@foobazco.org> | 2014-01-08 18:01:52 +0000 |
| commit | 7e7abd4d4c78353590cf18476fa374ff2e3e7176 (patch) | |
| tree | a50dc16a2f855d242ddc383f207b051c8b23d546 /usr/src/lib/libfru | |
| parent | 6ca718aa15285e34a516d3fae4b5f3e80a2f9240 (diff) | |
| parent | ee169c7e77bc5d28a401dde8533cbd38afd24ae1 (diff) | |
| download | illumos-joyent-release-20140109.tar.gz | |
[illumos-gate merge]20140109release-20140109
commit ee169c7e77bc5d28a401dde8533cbd38afd24ae1
4378 Clean up %C in *time() functions
438 need documentation for strftime %s flag
Conflicts:
usr/src/lib/print/libpapi-common/common/attribute.c (deleted)
usr/src/cmd/cron/cron.c (copyright)
Diffstat (limited to 'usr/src/lib/libfru')
| -rw-r--r-- | usr/src/lib/libfru/libnvfru/nvfru.c | 4 |
1 files changed, 3 insertions, 1 deletions
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; |