Fix yet more signedness conversion warnings.
I'd do the _nsec fields too, but I can't find any official type alias
for them.
Bug: 1292951
Change-Id: I31dcd2076756b402854b95d02cefee941b897e8f
Reviewed-on: https://chromium-review.googlesource.com/c/linux-syscall-support/+/3851022
Reviewed-by: Mike Frysinger <vapier@chromium.org>
diff --git a/linux_syscall_support.h b/linux_syscall_support.h
index bfa95f4..99a4b44 100644
--- a/linux_syscall_support.h
+++ b/linux_syscall_support.h
@@ -366,9 +366,11 @@
#ifdef __mips__
#if _MIPS_SIM == _MIPS_SIM_ABI64
typedef unsigned long long kernel_blkcnt_t;
+typedef unsigned kernel_blksize_t;
typedef unsigned kernel_dev_t;
typedef unsigned kernel_gid_t;
typedef unsigned long long kernel_ino_t;
+typedef unsigned kernel_mode_t;
typedef unsigned kernel_nlink_t;
typedef long long kernel_off_t;
typedef unsigned kernel_time_t;
@@ -468,9 +470,11 @@
/* include/asm-{arm,aarch64,i386,mips,x86_64,ppc,s390}/stat.h */
#if defined(__i386__) || defined(__ARM_ARCH_3__) || defined(__ARM_EABI__)
typedef unsigned kernel_blkcnt_t;
+typedef unsigned kernel_blksize_t;
typedef unsigned short kernel_dev_t;
typedef unsigned short kernel_gid_t;
typedef unsigned kernel_ino_t;
+typedef unsigned short kernel_mode_t;
typedef unsigned short kernel_nlink_t;
typedef unsigned kernel_off_t;
typedef unsigned kernel_time_t;
@@ -484,14 +488,14 @@
kernel_dev_t st_dev;
short pad1;
kernel_ino_t st_ino;
- unsigned short st_mode;
+ kernel_mode_t st_mode;
kernel_nlink_t st_nlink;
kernel_uid_t st_uid;
kernel_gid_t st_gid;
kernel_dev_t st_rdev;
short pad2;
kernel_off_t st_size;
- unsigned st_blksize;
+ kernel_blksize_t st_blksize;
kernel_blkcnt_t st_blocks;
kernel_time_t st_atime_;
unsigned st_atime_nsec_;
@@ -504,9 +508,11 @@
};
#elif defined(__x86_64__)
typedef int64_t kernel_blkcnt_t;
+typedef int64_t kernel_blksize_t;
typedef uint64_t kernel_dev_t;
typedef unsigned kernel_gid_t;
typedef uint64_t kernel_ino_t;
+typedef unsigned kernel_mode_t;
typedef uint64_t kernel_nlink_t;
typedef int64_t kernel_off_t;
typedef uint64_t kernel_time_t;
@@ -515,13 +521,13 @@
kernel_dev_t st_dev;
kernel_ino_t st_ino;
kernel_nlink_t st_nlink;
- unsigned st_mode;
+ kernel_mode_t st_mode;
kernel_uid_t st_uid;
kernel_gid_t st_gid;
unsigned __pad0;
kernel_dev_t st_rdev;
kernel_off_t st_size;
- int64_t st_blksize;
+ kernel_blksize_t st_blksize;
kernel_blkcnt_t st_blocks;
kernel_time_t st_atime_;
uint64_t st_atime_nsec_;
@@ -533,9 +539,11 @@
};
#elif defined(__PPC__)
typedef unsigned long kernel_blkcnt_t;
+typedef unsigned long kernel_blksize_t;
typedef unsigned kernel_dev_t;
typedef unsigned kernel_gid_t;
typedef unsigned long kernel_ino_t;
+typedef unsigned long kernel_mode_t;
typedef unsigned short kernel_nlink_t;
typedef long kernel_off_t;
typedef unsigned long kernel_time_t;
@@ -543,13 +551,13 @@
struct kernel_stat {
kernel_dev_t st_dev;
kernel_ino_t st_ino;
- unsigned long st_mode;
+ kernel_mode_t st_mode;
kernel_nlink_t st_nlink;
kernel_gid_t st_uid;
kernel_uid_t st_gid;
kernel_dev_t st_rdev;
kernel_off_t st_size;
- unsigned long st_blksize;
+ kernel_blksize_t st_blksize;
kernel_blkcnt_t st_blocks;
kernel_time_t st_atime_;
unsigned long st_atime_nsec_;
@@ -562,9 +570,11 @@
};
#elif (defined(__mips__) && _MIPS_SIM != _MIPS_SIM_ABI64)
typedef int kernel_blkcnt_t;
+typedef int kernel_blksize_t;
typedef unsigned kernel_dev_t;
typedef unsigned kernel_gid_t;
typedef unsigned kernel_ino_t;
+typedef unsigned kernel_mode_t;
typedef unsigned kernel_nlink_t;
typedef long kernel_off_t;
typedef long kernel_time_t;
@@ -573,7 +583,7 @@
kernel_dev_t st_dev;
int st_pad1[3];
kernel_ino_t st_ino;
- unsigned st_mode;
+ kernel_mode_t st_mode;
kernel_nlink_t st_nlink;
kernel_uid_t st_uid;
kernel_gid_t st_gid;
@@ -587,15 +597,17 @@
long st_mtime_nsec_;
kernel_time_t st_ctime_;
long st_ctime_nsec_;
- int st_blksize;
+ kernel_blksize_t st_blksize;
kernel_blkcnt_t st_blocks;
int st_pad4[14];
};
#elif defined(__aarch64__) || defined(__riscv) || defined(__loongarch_lp64)
typedef long kernel_blkcnt_t;
+typedef int kernel_blksize_t;
typedef unsigned long kernel_dev_t;
typedef unsigned int kernel_gid_t;
typedef unsigned long kernel_ino_t;
+typedef unsigned int kernel_mode_t;
typedef unsigned int kernel_nlink_t;
typedef long kernel_off_t;
typedef long kernel_time_t;
@@ -603,14 +615,14 @@
struct kernel_stat {
kernel_dev_t st_dev;
kernel_ino_t st_ino;
- unsigned int st_mode;
+ kernel_mode_t st_mode;
kernel_nlink_t st_nlink;
kernel_uid_t st_uid;
kernel_gid_t st_gid;
kernel_dev_t st_rdev;
unsigned long __pad1;
kernel_off_t st_size;
- int st_blksize;
+ kernel_blksize_t st_blksize;
int __pad2;
kernel_blkcnt_t st_blocks;
kernel_time_t st_atime_;
@@ -624,9 +636,11 @@
};
#elif defined(__s390x__)
typedef long kernel_blkcnt_t;
+typedef unsigned long kernel_blksize_t;
typedef unsigned long kernel_dev_t;
typedef unsigned int kernel_gid_t;
typedef unsigned long kernel_ino_t;
+typedef unsigned int kernel_mode_t;
typedef unsigned long kernel_nlink_t;
typedef unsigned long kernel_off_t;
typedef unsigned long kernel_time_t;
@@ -635,7 +649,7 @@
kernel_dev_t st_dev;
kernel_ino_t st_ino;
kernel_nlink_t st_nlink;
- unsigned int st_mode;
+ kernel_mode_t st_mode;
kernel_uid_t st_uid;
kernel_gid_t st_gid;
unsigned int __pad1;
@@ -647,15 +661,17 @@
unsigned long st_mtime_nsec_;
kernel_time_t st_ctime_;
unsigned long st_ctime_nsec_;
- unsigned long st_blksize;
+ kernel_blksize_t st_blksize;
kernel_blkcnt_t st_blocks;
unsigned long __unused[3];
};
#elif defined(__s390__)
typedef unsigned long kernel_blkcnt_t;
+typedef unsigned long kernel_blksize_t;
typedef unsigned short kernel_dev_t;
typedef unsigned short kernel_gid_t;
typedef unsigned long kernel_ino_t;
+typedef unsigned short kernel_mode_t;
typedef unsigned short kernel_nlink_t;
typedef unsigned long kernel_off_t;
typedef unsigned long kernel_time_t;
@@ -664,14 +680,14 @@
kernel_dev_t st_dev;
unsigned short __pad1;
kernel_ino_t st_ino;
- unsigned short st_mode;
+ kernel_mode_t st_mode;
kernel_nlink_t st_nlink;
kernel_uid_t st_uid;
kernel_gid_t st_gid;
kernel_dev_t st_rdev;
unsigned short __pad2;
kernel_off_t st_size;
- unsigned long st_blksize;
+ kernel_blksize_t st_blksize;
kernel_blkcnt_t st_blocks;
kernel_time_t st_atime_;
unsigned long st_atime_nsec_;
@@ -684,9 +700,11 @@
};
#elif defined(__e2k__)
typedef unsigned long kernel_blkcnt_t;
+typedef unsigned long kernel_blksize_t;
typedef unsigned long kernel_dev_t;
typedef unsigned int kernel_gid_t;
typedef unsigned long kernel_ino_t;
+typedef unsigned int kernel_mode_t;
typedef unsigned long kernel_nlink_t;
typedef unsigned long kernel_off_t;
typedef unsigned long kernel_time_t;
@@ -694,13 +712,13 @@
struct kernel_stat {
kernel_dev_t st_dev;
kernel_ino_t st_ino;
- unsigned int st_mode;
+ kernel_mode_t st_mode;
kernel_nlink_t st_nlink;
kernel_uid_t st_uid;
kernel_gid_t st_gid;
kernel_dev_t st_rdev;
kernel_off_t st_size;
- unsigned long st_blksize;
+ kernel_blksize_t st_blksize;
kernel_blkcnt_t st_blocks;
kernel_time_t st_atime_;
unsigned long st_atime_nsec_;
@@ -5187,7 +5205,7 @@
((from->stx_rdev_major & 0xfff) << 8) |
((from->stx_rdev_minor & ~0xffu) << 12));
to->st_ino = (kernel_ino_t)from->stx_ino;
- to->st_mode = from->stx_mode;
+ to->st_mode = (kernel_mode_t)from->stx_mode;
to->st_nlink = (kernel_nlink_t)from->stx_nlink;
to->st_uid = (kernel_uid_t)from->stx_uid;
to->st_gid = (kernel_gid_t)from->stx_gid;
@@ -5199,7 +5217,7 @@
to->st_ctime_nsec_ = from->stx_ctime.tv_nsec;
to->st_size = (kernel_off_t)(from->stx_size);
to->st_blocks = (kernel_blkcnt_t)(from->stx_blocks);
- to->st_blksize = from->stx_blksize;
+ to->st_blksize = (kernel_blksize_t)from->stx_blksize;
}
#endif