svn commit: r322074 - head/sys/boot/efi/libefi
Toomas Soome
tsoome at FreeBSD.org
Sat Aug 5 05:20:05 UTC 2017
Author: tsoome
Date: Sat Aug 5 05:20:03 2017
New Revision: 322074
URL: https://svnweb.freebsd.org/changeset/base/322074
Log:
libefi/time.c cstyle cleanup
libefi/time.c is mix of different styles, this update does cleanup.
Also fix 0 versus NULL, and zero the tv structure for case we get error
from UEFI firmware.
Reviewed by: imp
Differential Revision: https://reviews.freebsd.org/D11861
Modified:
head/sys/boot/efi/libefi/time.c
Modified: head/sys/boot/efi/libefi/time.c
==============================================================================
--- head/sys/boot/efi/libefi/time.c Sat Aug 5 00:28:42 2017 (r322073)
+++ head/sys/boot/efi/libefi/time.c Sat Aug 5 05:20:03 2017 (r322074)
@@ -2,28 +2,28 @@
* Copyright (c) 1999, 2000
* Intel Corporation.
* All rights reserved.
- *
+ *
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
* are met:
- *
+ *
* 1. Redistributions of source code must retain the above copyright
* notice, this list of conditions and the following disclaimer.
- *
+ *
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- *
+ *
* 3. All advertising materials mentioning features or use of this software
* must display the following acknowledgement:
- *
+ *
* This product includes software developed by Intel Corporation and
* its contributors.
- *
+ *
* 4. Neither the name of Intel Corporation or its contributors may be
* used to endorse or promote products derived from this software
* without specific prior written permission.
- *
+ *
* THIS SOFTWARE IS PROVIDED BY INTEL CORPORATION AND CONTRIBUTORS ``AS IS''
* AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
* IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
@@ -35,7 +35,7 @@
* CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
* ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
* THE POSSIBILITY OF SUCH DAMAGE.
- *
+ *
*/
#include <sys/cdefs.h>
@@ -48,50 +48,51 @@ __FBSDID("$FreeBSD$");
#include <sys/time.h>
/*
-// Accurate only for the past couple of centuries;
-// that will probably do.
-//
-// (#defines From FreeBSD 3.2 lib/libc/stdtime/tzfile.h)
-*/
+ * Accurate only for the past couple of centuries;
+ * that will probably do.
+ *
+ * (#defines From FreeBSD 3.2 lib/libc/stdtime/tzfile.h)
+ */
-#define isleap(y) (((y) % 4) == 0 && (((y) % 100) != 0 || ((y) % 400) == 0))
-#define SECSPERHOUR ( 60*60 )
-#define SECSPERDAY (24 * SECSPERHOUR)
+#define isleap(y) (((y) % 4) == 0 && \
+ (((y) % 100) != 0 || ((y) % 400) == 0))
+#define SECSPERHOUR (60*60)
+#define SECSPERDAY (24 * SECSPERHOUR)
/*
-// These arrays give the cumulative number of days up to the first of the
-// month number used as the index (1 -> 12) for regular and leap years.
-// The value at index 13 is for the whole year.
-*/
+ * These arrays give the cumulative number of days up to the first of the
+ * month number used as the index (1 -> 12) for regular and leap years.
+ * The value at index 13 is for the whole year.
+ */
static const time_t CumulativeDays[2][14] = {
- {0,
- 0,
- 31,
- 31 + 28,
- 31 + 28 + 31,
- 31 + 28 + 31 + 30,
- 31 + 28 + 31 + 30 + 31,
- 31 + 28 + 31 + 30 + 31 + 30,
- 31 + 28 + 31 + 30 + 31 + 30 + 31,
- 31 + 28 + 31 + 30 + 31 + 30 + 31 + 31,
- 31 + 28 + 31 + 30 + 31 + 30 + 31 + 31 + 30,
- 31 + 28 + 31 + 30 + 31 + 30 + 31 + 31 + 30 + 31,
- 31 + 28 + 31 + 30 + 31 + 30 + 31 + 31 + 30 + 31 + 30,
- 31 + 28 + 31 + 30 + 31 + 30 + 31 + 31 + 30 + 31 + 30 + 31 },
- {0,
- 0,
- 31,
- 31 + 29,
- 31 + 29 + 31,
- 31 + 29 + 31 + 30,
- 31 + 29 + 31 + 30 + 31,
- 31 + 29 + 31 + 30 + 31 + 30,
- 31 + 29 + 31 + 30 + 31 + 30 + 31,
- 31 + 29 + 31 + 30 + 31 + 30 + 31 + 31,
- 31 + 29 + 31 + 30 + 31 + 30 + 31 + 31 + 30,
- 31 + 29 + 31 + 30 + 31 + 30 + 31 + 31 + 30 + 31,
- 31 + 29 + 31 + 30 + 31 + 30 + 31 + 31 + 30 + 31 + 30,
- 31 + 29 + 31 + 30 + 31 + 30 + 31 + 31 + 30 + 31 + 30 + 31 }};
+ {0,
+ 0,
+ 31,
+ 31 + 28,
+ 31 + 28 + 31,
+ 31 + 28 + 31 + 30,
+ 31 + 28 + 31 + 30 + 31,
+ 31 + 28 + 31 + 30 + 31 + 30,
+ 31 + 28 + 31 + 30 + 31 + 30 + 31,
+ 31 + 28 + 31 + 30 + 31 + 30 + 31 + 31,
+ 31 + 28 + 31 + 30 + 31 + 30 + 31 + 31 + 30,
+ 31 + 28 + 31 + 30 + 31 + 30 + 31 + 31 + 30 + 31,
+ 31 + 28 + 31 + 30 + 31 + 30 + 31 + 31 + 30 + 31 + 30,
+ 31 + 28 + 31 + 30 + 31 + 30 + 31 + 31 + 30 + 31 + 30 + 31 },
+ {0,
+ 0,
+ 31,
+ 31 + 29,
+ 31 + 29 + 31,
+ 31 + 29 + 31 + 30,
+ 31 + 29 + 31 + 30 + 31,
+ 31 + 29 + 31 + 30 + 31 + 30,
+ 31 + 29 + 31 + 30 + 31 + 30 + 31,
+ 31 + 29 + 31 + 30 + 31 + 30 + 31 + 31,
+ 31 + 29 + 31 + 30 + 31 + 30 + 31 + 31 + 30,
+ 31 + 29 + 31 + 30 + 31 + 30 + 31 + 31 + 30 + 31,
+ 31 + 29 + 31 + 30 + 31 + 30 + 31 + 31 + 30 + 31 + 30,
+ 31 + 29 + 31 + 30 + 31 + 30 + 31 + 31 + 30 + 31 + 30 + 31 }};
void
efi_time_init(void)
@@ -106,145 +107,154 @@ efi_time_fini(void)
void
to_efi_time(EFI_TIME *efi_time, time_t time)
{
- if (time >= 0) {
- for (efi_time->Year = 1970;
- time > CumulativeDays[isleap(efi_time->Year)][13] * SECSPERDAY;
- time -= CumulativeDays[isleap(efi_time->Year)][13] * SECSPERDAY,
- efi_time->Year++);
+ int lyear, month;
+ time_t seconds;
- for (efi_time->Month = 0;
- time > CumulativeDays[isleap(efi_time->Year)][efi_time->Month] *
- SECSPERDAY;
- efi_time->Month++);
+ if (time >= 0) {
+ efi_time->Year = 1970;
+ lyear = isleap(efi_time->Year);
+ month = 13;
+ seconds = CumulativeDays[lyear][month] * SECSPERDAY;
+ while (time > seconds) {
+ time -= seconds;
+ efi_time->Year++;
+ lyear = isleap(efi_time->Year);
+ seconds = CumulativeDays[lyear][month] * SECSPERDAY;
+ }
- time -= CumulativeDays[isleap(efi_time->Year)][efi_time->Month - 1] *
- SECSPERDAY;
+ efi_time->Month = 0;
+ while (time >
+ CumulativeDays[lyear][month] * SECSPERDAY) {
+ efi_time->Month++;
+ }
- for (efi_time->Day = 0; time > SECSPERDAY;
- time -= SECSPERDAY, efi_time->Day++);
+ month = efi_time->Month - 1;
+ time -= CumulativeDays[lyear][month] * SECSPERDAY;
- for (efi_time->Hour = 0; time > SECSPERHOUR;
- time -= SECSPERHOUR, efi_time->Hour++);
+ for (efi_time->Day = 0; time > SECSPERDAY; efi_time->Day++)
+ time -= SECSPERDAY;
- for (efi_time->Minute = 0; time > 60;
- time -= 60, efi_time->Minute++);
+ for (efi_time->Hour = 0; time > SECSPERHOUR; efi_time->Hour++)
+ time -= SECSPERHOUR;
- efi_time->Second = time;
- efi_time->Nanosecond = 0;
- efi_time->TimeZone = 0;
- efi_time->Daylight = 0;
- } else {
- memset(efi_time, 0, sizeof(EFI_TIME));
- }
+ for (efi_time->Minute = 0; time > 60; efi_time->Minute++)
+ time -= 60;
+
+ efi_time->Second = time;
+ efi_time->Nanosecond = 0;
+ efi_time->TimeZone = 0;
+ efi_time->Daylight = 0;
+ } else {
+ memset(efi_time, 0, sizeof(EFI_TIME));
+ }
}
time_t
from_efi_time(EFI_TIME *ETime)
{
+ time_t UTime;
+ int Year;
- time_t UTime;
- int Year;
+ /*
+ * Do a santity check
+ */
+ if (ETime->Year < 1998 || ETime->Year > 2099 ||
+ ETime->Month == 0 || ETime->Month > 12 ||
+ ETime->Day == 0 || ETime->Month > 31 ||
+ ETime->Hour > 23 || ETime->Minute > 59 ||
+ ETime->Second > 59 || ETime->TimeZone < -1440 ||
+ (ETime->TimeZone > 1440 && ETime->TimeZone != 2047)) {
+ return (0);
+ }
- /*
- // Do a santity check
- */
- if ( ETime->Year < 1998 || ETime->Year > 2099 ||
- ETime->Month == 0 || ETime->Month > 12 ||
- ETime->Day == 0 || ETime->Month > 31 ||
- ETime->Hour > 23 ||
- ETime->Minute > 59 ||
- ETime->Second > 59 ||
- ETime->TimeZone < -1440 ||
- (ETime->TimeZone > 1440 && ETime->TimeZone != 2047) ) {
- return (0);
- }
+ /*
+ * Years
+ */
+ UTime = 0;
+ for (Year = 1970; Year != ETime->Year; ++Year) {
+ UTime += (CumulativeDays[isleap(Year)][13] * SECSPERDAY);
+ }
- /*
- // Years
- */
- UTime = 0;
- for (Year = 1970; Year != ETime->Year; ++Year) {
- UTime += (CumulativeDays[isleap(Year)][13] * SECSPERDAY);
- }
+ /*
+ * UTime should now be set to 00:00:00 on Jan 1 of the file's year.
+ *
+ * Months
+ */
+ UTime += (CumulativeDays[isleap(ETime->Year)][ETime->Month] *
+ SECSPERDAY);
- /*
- // UTime should now be set to 00:00:00 on Jan 1 of the file's year.
- //
- // Months
- */
- UTime += (CumulativeDays[isleap(ETime->Year)][ETime->Month] * SECSPERDAY);
+ /*
+ * UTime should now be set to 00:00:00 on the first of the file's
+ * month and year.
+ *
+ * Days -- Don't count the file's day
+ */
+ UTime += (((ETime->Day > 0) ? ETime->Day-1:0) * SECSPERDAY);
- /*
- // UTime should now be set to 00:00:00 on the first of the file's month and year
- //
- // Days -- Don't count the file's day
- */
- UTime += (((ETime->Day > 0) ? ETime->Day-1:0) * SECSPERDAY);
+ /*
+ * Hours
+ */
+ UTime += (ETime->Hour * SECSPERHOUR);
- /*
- // Hours
- */
- UTime += (ETime->Hour * SECSPERHOUR);
+ /*
+ * Minutes
+ */
+ UTime += (ETime->Minute * 60);
- /*
- // Minutes
- */
- UTime += (ETime->Minute * 60);
+ /*
+ * Seconds
+ */
+ UTime += ETime->Second;
- /*
- // Seconds
- */
- UTime += ETime->Second;
+ /*
+ * EFI time is repored in local time. Adjust for any time zone
+ * offset to get true UT
+ */
+ if (ETime->TimeZone != EFI_UNSPECIFIED_TIMEZONE) {
+ /*
+ * TimeZone is kept in minues...
+ */
+ UTime += (ETime->TimeZone * 60);
+ }
- /*
- // EFI time is repored in local time. Adjust for any time zone offset to
- // get true UT
- */
- if ( ETime->TimeZone != EFI_UNSPECIFIED_TIMEZONE ) {
- /*
- // TimeZone is kept in minues...
- */
- UTime += (ETime->TimeZone * 60);
- }
-
- return UTime;
+ return (UTime);
}
static int
-EFI_GetTimeOfDay(
- OUT struct timeval *tp,
- OUT struct timezone *tzp
- )
+EFI_GetTimeOfDay(OUT struct timeval *tp, OUT struct timezone *tzp)
{
EFI_TIME EfiTime;
EFI_TIME_CAPABILITIES Capabilities;
EFI_STATUS Status;
/*
- // Get time from EFI
- */
+ * Get time from EFI
+ */
Status = RS->GetTime(&EfiTime, &Capabilities);
if (EFI_ERROR(Status))
return (-1);
/*
- // Convert to UNIX time (ie seconds since the epoch
- */
+ * Convert to UNIX time (ie seconds since the epoch
+ */
- tp->tv_sec = from_efi_time( &EfiTime );
+ tp->tv_sec = from_efi_time(&EfiTime);
tp->tv_usec = 0; /* EfiTime.Nanosecond * 1000; */
/*
- // Do something with the timezone if needed
- */
+ * Do something with the timezone if needed
+ */
- if (tzp) {
- tzp->tz_minuteswest =
- EfiTime.TimeZone == EFI_UNSPECIFIED_TIMEZONE ? 0 : EfiTime.TimeZone;
+ if (tzp != NULL) {
+ if (EfiTime.TimeZone == EFI_UNSPECIFIED_TIMEZONE)
+ tzp->tz_minuteswest = 0;
+ else
+ tzp->tz_minuteswest = EfiTime.TimeZone;
/*
- // This isn't quit right since it doesn't deal with EFI_TIME_IN_DAYLIGHT
- */
+ * This isn't quit right since it doesn't deal with
+ * EFI_TIME_IN_DAYLIGHT
+ */
tzp->tz_dsttime =
EfiTime.Daylight & EFI_TIME_ADJUST_DAYLIGHT ? 1 : 0;
}
@@ -256,15 +266,18 @@ time_t
time(time_t *tloc)
{
struct timeval tv;
- EFI_GetTimeOfDay(&tv, 0);
-
+
+ memset(&tv, 0, sizeof(tv));
+ EFI_GetTimeOfDay(&tv, NULL);
+
if (tloc)
*tloc = tv.tv_sec;
- return tv.tv_sec;
+ return (tv.tv_sec);
}
time_t
getsecs(void)
{
- return time(NULL);
+
+ return (time(NULL));
}
More information about the svn-src-all
mailing list