diff options
author | Cyrill Gorcunov <gorcunov@gmail.com> | 2007-07-21 07:37:18 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-07-21 20:49:14 -0400 |
commit | 28de7948a896763bc97ccd416bba5b9422158350 (patch) | |
tree | abee128b137a6fa9fa4104b7bbc4ee409467c38f /fs/udf/udftime.c | |
parent | 71133027febfabd501fde7583b30008224f4d799 (diff) |
UDF: coding style conversion - lindent fixups
This patch fixes up sources after conversion by Lindent.
Signed-off-by: Cyrill Gorcunov <gorcunov@gmail.com>
Cc: Jan Kara <jack@ucw.cz>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'fs/udf/udftime.c')
-rw-r--r-- | fs/udf/udftime.c | 82 |
1 files changed, 40 insertions, 42 deletions
diff --git a/fs/udf/udftime.c b/fs/udf/udftime.c index b9f3198080e9..3fd80eb66af3 100644 --- a/fs/udf/udftime.c +++ b/fs/udf/udftime.c | |||
@@ -18,18 +18,18 @@ | |||
18 | Boston, MA 02111-1307, USA. */ | 18 | Boston, MA 02111-1307, USA. */ |
19 | 19 | ||
20 | /* | 20 | /* |
21 | * dgb 10/02/98: ripped this from glibc source to help convert timestamps to unix time | 21 | * dgb 10/02/98: ripped this from glibc source to help convert timestamps to unix time |
22 | * 10/04/98: added new table-based lookup after seeing how ugly the gnu code is | 22 | * 10/04/98: added new table-based lookup after seeing how ugly the gnu code is |
23 | * blf 09/27/99: ripped out all the old code and inserted new table from | 23 | * blf 09/27/99: ripped out all the old code and inserted new table from |
24 | * John Brockmeyer (without leap second corrections) | 24 | * John Brockmeyer (without leap second corrections) |
25 | * rewrote udf_stamp_to_time and fixed timezone accounting in | 25 | * rewrote udf_stamp_to_time and fixed timezone accounting in |
26 | udf_time_to_stamp. | 26 | * udf_time_to_stamp. |
27 | */ | 27 | */ |
28 | 28 | ||
29 | /* | 29 | /* |
30 | * We don't take into account leap seconds. This may be correct or incorrect. | 30 | * We don't take into account leap seconds. This may be correct or incorrect. |
31 | * For more NIST information (especially dealing with leap seconds), see: | 31 | * For more NIST information (especially dealing with leap seconds), see: |
32 | * http://www.boulder.nist.gov/timefreq/pubs/bulletin/leapsecond.htm | 32 | * http://www.boulder.nist.gov/timefreq/pubs/bulletin/leapsecond.htm |
33 | */ | 33 | */ |
34 | 34 | ||
35 | #include <linux/types.h> | 35 | #include <linux/types.h> |
@@ -54,28 +54,28 @@ static const unsigned short int __mon_yday[2][13] = { | |||
54 | }; | 54 | }; |
55 | 55 | ||
56 | #define MAX_YEAR_SECONDS 69 | 56 | #define MAX_YEAR_SECONDS 69 |
57 | #define SPD 0x15180 /*3600*24 */ | 57 | #define SPD 0x15180 /*3600*24 */ |
58 | #define SPY(y,l,s) (SPD * (365*y+l)+s) | 58 | #define SPY(y,l,s) (SPD * (365*y+l)+s) |
59 | 59 | ||
60 | static time_t year_seconds[MAX_YEAR_SECONDS] = { | 60 | static time_t year_seconds[MAX_YEAR_SECONDS]= { |
61 | /*1970*/ SPY(0, 0, 0), SPY(1, 0, 0), SPY(2, 0, 0), SPY(3, 1, 0), | 61 | /*1970*/ SPY( 0, 0,0), SPY( 1, 0,0), SPY( 2, 0,0), SPY( 3, 1,0), |
62 | /*1974*/ SPY(4, 1, 0), SPY(5, 1, 0), SPY(6, 1, 0), SPY(7, 2, 0), | 62 | /*1974*/ SPY( 4, 1,0), SPY( 5, 1,0), SPY( 6, 1,0), SPY( 7, 2,0), |
63 | /*1978*/ SPY(8, 2, 0), SPY(9, 2, 0), SPY(10, 2, 0), SPY(11, 3, 0), | 63 | /*1978*/ SPY( 8, 2,0), SPY( 9, 2,0), SPY(10, 2,0), SPY(11, 3,0), |
64 | /*1982*/ SPY(12, 3, 0), SPY(13, 3, 0), SPY(14, 3, 0), SPY(15, 4, 0), | 64 | /*1982*/ SPY(12, 3,0), SPY(13, 3,0), SPY(14, 3,0), SPY(15, 4,0), |
65 | /*1986*/ SPY(16, 4, 0), SPY(17, 4, 0), SPY(18, 4, 0), SPY(19, 5, 0), | 65 | /*1986*/ SPY(16, 4,0), SPY(17, 4,0), SPY(18, 4,0), SPY(19, 5,0), |
66 | /*1990*/ SPY(20, 5, 0), SPY(21, 5, 0), SPY(22, 5, 0), SPY(23, 6, 0), | 66 | /*1990*/ SPY(20, 5,0), SPY(21, 5,0), SPY(22, 5,0), SPY(23, 6,0), |
67 | /*1994*/ SPY(24, 6, 0), SPY(25, 6, 0), SPY(26, 6, 0), SPY(27, 7, 0), | 67 | /*1994*/ SPY(24, 6,0), SPY(25, 6,0), SPY(26, 6,0), SPY(27, 7,0), |
68 | /*1998*/ SPY(28, 7, 0), SPY(29, 7, 0), SPY(30, 7, 0), SPY(31, 8, 0), | 68 | /*1998*/ SPY(28, 7,0), SPY(29, 7,0), SPY(30, 7,0), SPY(31, 8,0), |
69 | /*2002*/ SPY(32, 8, 0), SPY(33, 8, 0), SPY(34, 8, 0), SPY(35, 9, 0), | 69 | /*2002*/ SPY(32, 8,0), SPY(33, 8,0), SPY(34, 8,0), SPY(35, 9,0), |
70 | /*2006*/ SPY(36, 9, 0), SPY(37, 9, 0), SPY(38, 9, 0), SPY(39, 10, 0), | 70 | /*2006*/ SPY(36, 9,0), SPY(37, 9,0), SPY(38, 9,0), SPY(39,10,0), |
71 | /*2010*/ SPY(40, 10, 0), SPY(41, 10, 0), SPY(42, 10, 0), SPY(43, 11, 0), | 71 | /*2010*/ SPY(40,10,0), SPY(41,10,0), SPY(42,10,0), SPY(43,11,0), |
72 | /*2014*/ SPY(44, 11, 0), SPY(45, 11, 0), SPY(46, 11, 0), SPY(47, 12, 0), | 72 | /*2014*/ SPY(44,11,0), SPY(45,11,0), SPY(46,11,0), SPY(47,12,0), |
73 | /*2018*/ SPY(48, 12, 0), SPY(49, 12, 0), SPY(50, 12, 0), SPY(51, 13, 0), | 73 | /*2018*/ SPY(48,12,0), SPY(49,12,0), SPY(50,12,0), SPY(51,13,0), |
74 | /*2022*/ SPY(52, 13, 0), SPY(53, 13, 0), SPY(54, 13, 0), SPY(55, 14, 0), | 74 | /*2022*/ SPY(52,13,0), SPY(53,13,0), SPY(54,13,0), SPY(55,14,0), |
75 | /*2026*/ SPY(56, 14, 0), SPY(57, 14, 0), SPY(58, 14, 0), SPY(59, 15, 0), | 75 | /*2026*/ SPY(56,14,0), SPY(57,14,0), SPY(58,14,0), SPY(59,15,0), |
76 | /*2030*/ SPY(60, 15, 0), SPY(61, 15, 0), SPY(62, 15, 0), SPY(63, 16, 0), | 76 | /*2030*/ SPY(60,15,0), SPY(61,15,0), SPY(62,15,0), SPY(63,16,0), |
77 | /*2034*/ SPY(64, 16, 0), SPY(65, 16, 0), SPY(66, 16, 0), SPY(67, 17, 0), | 77 | /*2034*/ SPY(64,16,0), SPY(65,16,0), SPY(66,16,0), SPY(67,17,0), |
78 | /*2038*/ SPY(68, 17, 0) | 78 | /*2038*/ SPY(68,17,0) |
79 | }; | 79 | }; |
80 | 80 | ||
81 | extern struct timezone sys_tz; | 81 | extern struct timezone sys_tz; |
@@ -83,7 +83,7 @@ extern struct timezone sys_tz; | |||
83 | #define SECS_PER_HOUR (60 * 60) | 83 | #define SECS_PER_HOUR (60 * 60) |
84 | #define SECS_PER_DAY (SECS_PER_HOUR * 24) | 84 | #define SECS_PER_DAY (SECS_PER_HOUR * 24) |
85 | 85 | ||
86 | time_t *udf_stamp_to_time(time_t * dest, long *dest_usec, kernel_timestamp src) | 86 | time_t *udf_stamp_to_time(time_t *dest, long *dest_usec, kernel_timestamp src) |
87 | { | 87 | { |
88 | int yday; | 88 | int yday; |
89 | uint8_t type = src.typeAndTimezone >> 12; | 89 | uint8_t type = src.typeAndTimezone >> 12; |
@@ -93,10 +93,11 @@ time_t *udf_stamp_to_time(time_t * dest, long *dest_usec, kernel_timestamp src) | |||
93 | offset = src.typeAndTimezone << 4; | 93 | offset = src.typeAndTimezone << 4; |
94 | /* sign extent offset */ | 94 | /* sign extent offset */ |
95 | offset = (offset >> 4); | 95 | offset = (offset >> 4); |
96 | if (offset == -2047) /* unspecified offset */ | 96 | if (offset == -2047) /* unspecified offset */ |
97 | offset = 0; | 97 | offset = 0; |
98 | } else | 98 | } else { |
99 | offset = 0; | 99 | offset = 0; |
100 | } | ||
100 | 101 | ||
101 | if ((src.year < EPOCH_YEAR) || | 102 | if ((src.year < EPOCH_YEAR) || |
102 | (src.year >= EPOCH_YEAR + MAX_YEAR_SECONDS)) { | 103 | (src.year >= EPOCH_YEAR + MAX_YEAR_SECONDS)) { |
@@ -107,12 +108,10 @@ time_t *udf_stamp_to_time(time_t * dest, long *dest_usec, kernel_timestamp src) | |||
107 | *dest = year_seconds[src.year - EPOCH_YEAR]; | 108 | *dest = year_seconds[src.year - EPOCH_YEAR]; |
108 | *dest -= offset * 60; | 109 | *dest -= offset * 60; |
109 | 110 | ||
110 | yday = ((__mon_yday[__isleap(src.year)] | 111 | yday = ((__mon_yday[__isleap (src.year)] |
111 | [src.month - 1]) + (src.day - 1)); | 112 | [src.month - 1]) + (src.day - 1)); |
112 | *dest += (((yday * 24) + src.hour) * 60 + src.minute) * 60 + src.second; | 113 | *dest += ( ( (yday * 24) + src.hour ) * 60 + src.minute ) * 60 + src.second; |
113 | *dest_usec = | 114 | *dest_usec = src.centiseconds * 10000 + src.hundredsOfMicroseconds * 100 + src.microseconds; |
114 | src.centiseconds * 10000 + src.hundredsOfMicroseconds * 100 + | ||
115 | src.microseconds; | ||
116 | return dest; | 115 | return dest; |
117 | } | 116 | } |
118 | 117 | ||
@@ -145,8 +144,9 @@ kernel_timestamp *udf_time_to_stamp(kernel_timestamp * dest, struct timespec ts) | |||
145 | long int yg = y + days / 365 - (days % 365 < 0); | 144 | long int yg = y + days / 365 - (days % 365 < 0); |
146 | 145 | ||
147 | /* Adjust DAYS and Y to match the guessed year. */ | 146 | /* Adjust DAYS and Y to match the guessed year. */ |
148 | days -= ((yg - y) * 365 + LEAPS_THRU_END_OF(yg - 1) | 147 | days -= ((yg - y) * 365 |
149 | - LEAPS_THRU_END_OF(y - 1)); | 148 | + LEAPS_THRU_END_OF (yg - 1) |
149 | - LEAPS_THRU_END_OF (y - 1)); | ||
150 | y = yg; | 150 | y = yg; |
151 | } | 151 | } |
152 | dest->year = y; | 152 | dest->year = y; |
@@ -158,11 +158,9 @@ kernel_timestamp *udf_time_to_stamp(kernel_timestamp * dest, struct timespec ts) | |||
158 | dest->day = days + 1; | 158 | dest->day = days + 1; |
159 | 159 | ||
160 | dest->centiseconds = ts.tv_nsec / 10000000; | 160 | dest->centiseconds = ts.tv_nsec / 10000000; |
161 | dest->hundredsOfMicroseconds = | 161 | dest->hundredsOfMicroseconds = (ts.tv_nsec / 1000 - dest->centiseconds * 10000) / 100; |
162 | (ts.tv_nsec / 1000 - dest->centiseconds * 10000) / 100; | 162 | dest->microseconds = (ts.tv_nsec / 1000 - dest->centiseconds * 10000 - |
163 | dest->microseconds = | 163 | dest->hundredsOfMicroseconds * 100); |
164 | (ts.tv_nsec / 1000 - dest->centiseconds * 10000 - | ||
165 | dest->hundredsOfMicroseconds * 100); | ||
166 | return dest; | 164 | return dest; |
167 | } | 165 | } |
168 | 166 | ||