Skip to content

Commit 25032c2

Browse files
xbjfkxbjfk
committed
musl: change struct stat/stat64 times to timespec
SOURCE: https://github.com/kraj/musl/blob/8cb84492b0245d70b2cd0edd523e2b55c7ad67a9/arch/generic/bits/stat.h#L14
1 parent 8e06fa2 commit 25032c2

14 files changed

Lines changed: 24 additions & 208 deletions

File tree

‎src/unix/linux_like/linux/musl/b32/arm/mod.rs‎

Lines changed: 6 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -27,18 +27,12 @@ s! {
2727
#[cfg(musl32_time64)]
2828
__st_ctim32: Padding<__c_anonymous_timespec32>,
2929

30-
#[cfg(not(musl_v1_2_3))]
31-
pub st_atime: crate::time_t,
32-
#[cfg(not(musl_v1_2_3))]
33-
pub st_atime_nsec: c_long,
34-
#[cfg(not(musl_v1_2_3))]
35-
pub st_mtime: crate::time_t,
36-
#[cfg(not(musl_v1_2_3))]
37-
pub st_mtime_nsec: c_long,
38-
#[cfg(not(musl_v1_2_3))]
39-
pub st_ctime: crate::time_t,
40-
#[cfg(not(musl_v1_2_3))]
41-
pub st_ctime_nsec: c_long,
30+
#[cfg(not(musl32_time64))]
31+
pub st_atim: crate::timespec,
32+
#[cfg(not(musl32_time64))]
33+
pub st_mtim: crate::timespec,
34+
#[cfg(not(musl32_time64))]
35+
pub st_ctim: crate::timespec,
4236

4337
pub st_ino: crate::ino_t,
4438

‎src/unix/linux_like/linux/musl/b32/hexagon.rs‎

Lines changed: 0 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -18,24 +18,8 @@ s! {
1818
__st_blksize_padding: Padding<c_int>,
1919
pub st_blocks: crate::blkcnt_t,
2020

21-
#[cfg(not(musl_v1_2_3))]
22-
pub st_atime: crate::time_t,
23-
#[cfg(not(musl_v1_2_3))]
24-
pub st_atime_nsec: c_long,
25-
#[cfg(not(musl_v1_2_3))]
26-
pub st_mtime: crate::time_t,
27-
#[cfg(not(musl_v1_2_3))]
28-
pub st_mtime_nsec: c_long,
29-
#[cfg(not(musl_v1_2_3))]
30-
pub st_ctime: crate::time_t,
31-
#[cfg(not(musl_v1_2_3))]
32-
pub st_ctime_nsec: c_long,
33-
34-
#[cfg(musl_v1_2_3)]
3521
pub st_atim: crate::timespec,
36-
#[cfg(musl_v1_2_3)]
3722
pub st_mtim: crate::timespec,
38-
#[cfg(musl_v1_2_3)]
3923
pub st_ctim: crate::timespec,
4024

4125
__unused: Padding<[c_int; 2]>,

‎src/unix/linux_like/linux/musl/b32/mips/mod.rs‎

Lines changed: 6 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -25,18 +25,12 @@ s! {
2525
#[cfg(musl32_time64)]
2626
__st_ctim32: Padding<__c_anonymous_timespec32>,
2727

28-
#[cfg(not(musl_v1_2_3))]
29-
pub st_atime: crate::time_t,
30-
#[cfg(not(musl_v1_2_3))]
31-
pub st_atime_nsec: c_long,
32-
#[cfg(not(musl_v1_2_3))]
33-
pub st_mtime: crate::time_t,
34-
#[cfg(not(musl_v1_2_3))]
35-
pub st_mtime_nsec: c_long,
36-
#[cfg(not(musl_v1_2_3))]
37-
pub st_ctime: crate::time_t,
38-
#[cfg(not(musl_v1_2_3))]
39-
pub st_ctime_nsec: c_long,
28+
#[cfg(not(musl32_time64))]
29+
pub st_atim: crate::timespec,
30+
#[cfg(not(musl32_time64))]
31+
pub st_mtim: crate::timespec,
32+
#[cfg(not(musl32_time64))]
33+
pub st_ctim: crate::timespec,
4034

4135
pub st_blksize: crate::blksize_t,
4236
__st_padding3: Padding<c_long>,

‎src/unix/linux_like/linux/musl/b32/powerpc.rs‎

Lines changed: 6 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -37,18 +37,12 @@ s! {
3737
#[cfg(musl32_time64)]
3838
__st_ctim32: Padding<__c_anonymous_timespec32>,
3939

40-
#[cfg(not(musl_v1_2_3))]
41-
pub st_atime: crate::time_t,
42-
#[cfg(not(musl_v1_2_3))]
43-
pub st_atime_nsec: c_long,
44-
#[cfg(not(musl_v1_2_3))]
45-
pub st_mtime: crate::time_t,
46-
#[cfg(not(musl_v1_2_3))]
47-
pub st_mtime_nsec: c_long,
48-
#[cfg(not(musl_v1_2_3))]
49-
pub st_ctime: crate::time_t,
50-
#[cfg(not(musl_v1_2_3))]
51-
pub st_ctime_nsec: c_long,
40+
#[cfg(not(musl32_time64))]
41+
pub st_atim: crate::timespec,
42+
#[cfg(not(musl32_time64))]
43+
pub st_mtim: crate::timespec,
44+
#[cfg(not(musl32_time64))]
45+
pub st_ctim: crate::timespec,
5246

5347
__unused: Padding<[c_long; 2]>,
5448

‎src/unix/linux_like/linux/musl/b32/riscv32/mod.rs‎

Lines changed: 0 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -22,24 +22,8 @@ s! {
2222
pub __pad2: c_int,
2323
pub st_blocks: crate::blkcnt_t,
2424

25-
#[cfg(not(musl_v1_2_3))]
26-
pub st_atime: crate::time_t,
27-
#[cfg(not(musl_v1_2_3))]
28-
pub st_atime_nsec: c_long,
29-
#[cfg(not(musl_v1_2_3))]
30-
pub st_mtime: crate::time_t,
31-
#[cfg(not(musl_v1_2_3))]
32-
pub st_mtime_nsec: c_long,
33-
#[cfg(not(musl_v1_2_3))]
34-
pub st_ctime: crate::time_t,
35-
#[cfg(not(musl_v1_2_3))]
36-
pub st_ctime_nsec: c_long,
37-
38-
#[cfg(musl_v1_2_3)]
3925
pub st_atim: crate::timespec,
40-
#[cfg(musl_v1_2_3)]
4126
pub st_mtim: crate::timespec,
42-
#[cfg(musl_v1_2_3)]
4327
pub st_ctim: crate::timespec,
4428

4529
__unused: Padding<[c_int; 2usize]>,

‎src/unix/linux_like/linux/musl/b32/x86/mod.rs‎

Lines changed: 6 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -27,18 +27,12 @@ s! {
2727
#[cfg(musl32_time64)]
2828
__st_ctim32: Padding<__c_anonymous_timespec32>,
2929

30-
#[cfg(not(musl_v1_2_3))]
31-
pub st_atime: crate::time_t,
32-
#[cfg(not(musl_v1_2_3))]
33-
pub st_atime_nsec: c_long,
34-
#[cfg(not(musl_v1_2_3))]
35-
pub st_mtime: crate::time_t,
36-
#[cfg(not(musl_v1_2_3))]
37-
pub st_mtime_nsec: c_long,
38-
#[cfg(not(musl_v1_2_3))]
39-
pub st_ctime: crate::time_t,
40-
#[cfg(not(musl_v1_2_3))]
41-
pub st_ctime_nsec: c_long,
30+
#[cfg(not(musl32_time64))]
31+
pub st_atim: crate::timespec,
32+
#[cfg(not(musl32_time64))]
33+
pub st_mtim: crate::timespec,
34+
#[cfg(not(musl32_time64))]
35+
pub st_ctim: crate::timespec,
4236

4337
pub st_ino: crate::ino_t,
4438

‎src/unix/linux_like/linux/musl/b64/aarch64/mod.rs‎

Lines changed: 0 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -24,24 +24,8 @@ s! {
2424
__pad1: Padding<c_int>,
2525
pub st_blocks: crate::blkcnt_t,
2626

27-
#[cfg(not(musl_v1_2_3))]
28-
pub st_atime: crate::time_t,
29-
#[cfg(not(musl_v1_2_3))]
30-
pub st_atime_nsec: c_long,
31-
#[cfg(not(musl_v1_2_3))]
32-
pub st_mtime: crate::time_t,
33-
#[cfg(not(musl_v1_2_3))]
34-
pub st_mtime_nsec: c_long,
35-
#[cfg(not(musl_v1_2_3))]
36-
pub st_ctime: crate::time_t,
37-
#[cfg(not(musl_v1_2_3))]
38-
pub st_ctime_nsec: c_long,
39-
40-
#[cfg(musl_v1_2_3)]
4127
pub st_atim: crate::timespec,
42-
#[cfg(musl_v1_2_3)]
4328
pub st_mtim: crate::timespec,
44-
#[cfg(musl_v1_2_3)]
4529
pub st_ctim: crate::timespec,
4630

4731
__unused: Padding<[c_uint; 2]>,

‎src/unix/linux_like/linux/musl/b64/loongarch64/mod.rs‎

Lines changed: 0 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -27,24 +27,8 @@ s! {
2727
__pad2: Padding<c_int>,
2828
pub st_blocks: crate::blkcnt_t,
2929

30-
#[cfg(not(musl_v1_2_3))]
31-
pub st_atime: crate::time_t,
32-
#[cfg(not(musl_v1_2_3))]
33-
pub st_atime_nsec: c_long,
34-
#[cfg(not(musl_v1_2_3))]
35-
pub st_mtime: crate::time_t,
36-
#[cfg(not(musl_v1_2_3))]
37-
pub st_mtime_nsec: c_long,
38-
#[cfg(not(musl_v1_2_3))]
39-
pub st_ctime: crate::time_t,
40-
#[cfg(not(musl_v1_2_3))]
41-
pub st_ctime_nsec: c_long,
42-
43-
#[cfg(musl_v1_2_3)]
4430
pub st_atim: crate::timespec,
45-
#[cfg(musl_v1_2_3)]
4631
pub st_mtim: crate::timespec,
47-
#[cfg(musl_v1_2_3)]
4832
pub st_ctim: crate::timespec,
4933

5034
__unused: Padding<[c_int; 2usize]>,

‎src/unix/linux_like/linux/musl/b64/mips64.rs‎

Lines changed: 0 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -23,24 +23,8 @@ s! {
2323
pub st_size: off_t,
2424
__pad3: Padding<c_int>,
2525

26-
#[cfg(not(musl_v1_2_3))]
27-
pub st_atime: crate::time_t,
28-
#[cfg(not(musl_v1_2_3))]
29-
pub st_atime_nsec: c_long,
30-
#[cfg(not(musl_v1_2_3))]
31-
pub st_mtime: crate::time_t,
32-
#[cfg(not(musl_v1_2_3))]
33-
pub st_mtime_nsec: c_long,
34-
#[cfg(not(musl_v1_2_3))]
35-
pub st_ctime: crate::time_t,
36-
#[cfg(not(musl_v1_2_3))]
37-
pub st_ctime_nsec: c_long,
38-
39-
#[cfg(musl_v1_2_3)]
4026
pub st_atim: crate::timespec,
41-
#[cfg(musl_v1_2_3)]
4227
pub st_mtim: crate::timespec,
43-
#[cfg(musl_v1_2_3)]
4428
pub st_ctim: crate::timespec,
4529

4630
pub st_blksize: crate::blksize_t,

‎src/unix/linux_like/linux/musl/b64/powerpc64.rs‎

Lines changed: 0 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -34,24 +34,8 @@ s! {
3434
pub st_blksize: crate::blksize_t,
3535
pub st_blocks: crate::blkcnt_t,
3636

37-
#[cfg(not(musl_v1_2_3))]
38-
pub st_atime: crate::time_t,
39-
#[cfg(not(musl_v1_2_3))]
40-
pub st_atime_nsec: c_long,
41-
#[cfg(not(musl_v1_2_3))]
42-
pub st_mtime: crate::time_t,
43-
#[cfg(not(musl_v1_2_3))]
44-
pub st_mtime_nsec: c_long,
45-
#[cfg(not(musl_v1_2_3))]
46-
pub st_ctime: crate::time_t,
47-
#[cfg(not(musl_v1_2_3))]
48-
pub st_ctime_nsec: c_long,
49-
50-
#[cfg(musl_v1_2_3)]
5137
pub st_atim: crate::timespec,
52-
#[cfg(musl_v1_2_3)]
5338
pub st_mtim: crate::timespec,
54-
#[cfg(musl_v1_2_3)]
5539
pub st_ctim: crate::timespec,
5640

5741
__unused: Padding<[c_long; 3]>,

0 commit comments

Comments
 (0)