From d39e489c3a65914530ee7c2a24d730329983f293 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Herm=C3=A8s=20B=C3=A9lusca-Ma=C3=AFto?= Date: Mon, 4 Jul 2016 20:40:45 +0000 Subject: [PATCH] [RTL]: Code styling modifications only: - Use RtlCopyMemory, - Don't hardcode types for sizeof(parameters), - Braces for 'for'-loops, - while (TRUE) instead of while (1), - Use ULONG for integer iterator that cannot be negative, - Start sentences with capitals. svn path=/trunk/; revision=71812 --- reactos/sdk/lib/rtl/time.c | 38 ++++++++++++++++++++------------------ 1 file changed, 20 insertions(+), 18 deletions(-) diff --git a/reactos/sdk/lib/rtl/time.c b/reactos/sdk/lib/rtl/time.c index e37dd13c7c6..7f7974aa6c5 100644 --- a/reactos/sdk/lib/rtl/time.c +++ b/reactos/sdk/lib/rtl/time.c @@ -170,12 +170,12 @@ NTAPI RtlTimeFieldsToTime(IN PTIME_FIELDS TimeFields, OUT PLARGE_INTEGER Time) { - int CurMonth; + ULONG CurMonth; TIME_FIELDS IntTimeFields; - memcpy(&IntTimeFields, - TimeFields, - sizeof(TIME_FIELDS)); + RtlCopyMemory(&IntTimeFields, + TimeFields, + sizeof(TIME_FIELDS)); if (TimeFields->Milliseconds < 0 || TimeFields->Milliseconds > 999 || TimeFields->Second < 0 || TimeFields->Second > 59 || @@ -260,27 +260,27 @@ RtlTimeToTimeFields(IN PLARGE_INTEGER Time, ULONGLONG IntTime = Time->QuadPart; /* Extract millisecond from time and convert time into seconds */ - TimeFields->Milliseconds = (CSHORT) ((IntTime % TICKSPERSEC) / TICKSPERMSEC); + TimeFields->Milliseconds = (CSHORT)((IntTime % TICKSPERSEC) / TICKSPERMSEC); IntTime = IntTime / TICKSPERSEC; /* Split the time into days and seconds within the day */ Days = (ULONG)(IntTime / SECSPERDAY); SecondsInDay = IntTime % SECSPERDAY; - /* compute time of day */ - TimeFields->Hour = (CSHORT) (SecondsInDay / SECSPERHOUR); + /* Compute time of day */ + TimeFields->Hour = (CSHORT)(SecondsInDay / SECSPERHOUR); SecondsInDay = SecondsInDay % SECSPERHOUR; - TimeFields->Minute = (CSHORT) (SecondsInDay / SECSPERMIN); - TimeFields->Second = (CSHORT) (SecondsInDay % SECSPERMIN); + TimeFields->Minute = (CSHORT)(SecondsInDay / SECSPERMIN); + TimeFields->Second = (CSHORT)(SecondsInDay % SECSPERMIN); - /* compute day of week */ - TimeFields->Weekday = (CSHORT) ((EPOCHWEEKDAY + Days) % DAYSPERWEEK); + /* Compute day of week */ + TimeFields->Weekday = (CSHORT)((EPOCHWEEKDAY + Days) % DAYSPERWEEK); - /* compute year */ + /* Compute year */ CurYear = EPOCHYEAR; CurYear += Days / DAYSPERLEAPYEAR; Days -= DaysSinceEpoch(CurYear); - while (1) + while (TRUE) { LeapYear = IsLeapYear(CurYear); if (Days < YearLengths[LeapYear]) @@ -290,15 +290,17 @@ RtlTimeToTimeFields(IN PLARGE_INTEGER Time, CurYear++; Days = Days - YearLengths[LeapYear]; } - TimeFields->Year = (CSHORT) CurYear; + TimeFields->Year = (CSHORT)CurYear; /* Compute month of year */ LeapYear = IsLeapYear(CurYear); Months = MonthLengths[LeapYear]; for (CurMonth = 0; Days >= Months[CurMonth]; CurMonth++) + { Days = Days - Months[CurMonth]; - TimeFields->Month = (CSHORT) (CurMonth + 1); - TimeFields->Day = (CSHORT) (Days + 1); + } + TimeFields->Month = (CSHORT)(CurMonth + 1); + TimeFields->Day = (CSHORT)(Days + 1); } @@ -359,7 +361,7 @@ RtlLocalTimeToSystemTime(IN PLARGE_INTEGER LocalTime, Status = ZwQuerySystemInformation(SystemTimeOfDayInformation, &TimeInformation, - sizeof(SYSTEM_TIMEOFDAY_INFORMATION), + sizeof(TimeInformation), NULL); if (!NT_SUCCESS(Status)) return Status; @@ -384,7 +386,7 @@ RtlSystemTimeToLocalTime(IN PLARGE_INTEGER SystemTime, Status = ZwQuerySystemInformation(SystemTimeOfDayInformation, &TimeInformation, - sizeof(SYSTEM_TIMEOFDAY_INFORMATION), + sizeof(TimeInformation), NULL); if (!NT_SUCCESS(Status)) return Status;