KekenoBSD/src
3
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

linprocfs: Really fix time_t type issue

Browse Source 
The cast to (long) is wrong on all the other 32-bit platforms. (long
long) is the correct type on all platforms. Also, use a z modifier for
size_t which also fails on 32-bit platforms.

Fixes: 02f481a30b
Sponsored by: Netflix
This commit is contained in:
Warner Losh
2024-05-11 22:53:15 -06:00
parent 6d79564fe3
commit ee2e36686e
1 changed files with 11 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
sys/compat/linprocfs/linprocfs.c
+11 -11
View File
@@ -2133,7 +2133,7 @@ linprocfs_dosysvipc_msg(PFS_FILL_ARGS)
for (id = 0; id < msgmni; id++)
if (msqids[id].u.msg_qbytes != 0)
sbuf_printf(sb,
"%10d %10lu %4o %10lu %10lu %5u %5u %5u %5u %5u %5u %10ld %10ld %10ld\n",
"%10d %10lu %4o %10lu %10lu %5u %5u %5u %5u %5u %5u %10lld %10lld %10lld\n",
(int) msqids[id].u.msg_perm.key,
IXSEQ_TO_IPCID(id, msqids[id].u.msg_perm),
msqids[id].u.msg_perm.mode,
@@ -2145,9 +2145,9 @@ linprocfs_dosysvipc_msg(PFS_FILL_ARGS)
msqids[id].u.msg_perm.gid,
msqids[id].u.msg_perm.cuid,
msqids[id].u.msg_perm.cgid,
(long)msqids[id].u.msg_stime,
(long)msqids[id].u.msg_rtime,
(long)msqids[id].u.msg_ctime);
(long long)msqids[id].u.msg_stime,
(long long)msqids[id].u.msg_rtime,
(long long)msqids[id].u.msg_ctime);
free(msqids, M_TEMP);
return (0);
@@ -2190,7 +2190,7 @@ linprocfs_dosysvipc_sem(PFS_FILL_ARGS)
for (id = 0; id < semmni; id++)
if ((semids[id].u.sem_perm.mode & SEM_ALLOC) != 0)
sbuf_printf(sb,
"%10d %10lu %4o %10u %5u %5u %5u %5u %10ld %10ld\n",
"%10d %10lu %4o %10u %5u %5u %5u %5u %10lld %10lld\n",
(int) semids[id].u.sem_perm.key,
IXSEQ_TO_IPCID(id, semids[id].u.sem_perm),
semids[id].u.sem_perm.mode,
@@ -2199,8 +2199,8 @@ linprocfs_dosysvipc_sem(PFS_FILL_ARGS)
semids[id].u.sem_perm.gid,
semids[id].u.sem_perm.cuid,
semids[id].u.sem_perm.cgid,
(long)semids[id].u.sem_otime,
(long)semids[id].u.sem_ctime);
(long long)semids[id].u.sem_otime,
(long long)semids[id].u.sem_ctime);
free(semids, M_TEMP);
return (0);
@@ -2244,7 +2244,7 @@ linprocfs_dosysvipc_shm(PFS_FILL_ARGS)
for (id = 0; id < shmmni; id++)
if ((shmids[id].u.shm_perm.mode & SHMSEG_ALLOCATED) != 0)
sbuf_printf(sb,
"%10d %10lu %4o %21lu %5u %5u %5u %5u %5u %5u %5u %10ld %10ld %10ld %21d %21d\n",
"%10d %10lu %4o %21zu %5u %5u %5u %5u %5u %5u %5u %10lld %10lld %10lld %21d %21d\n",
(int) shmids[id].u.shm_perm.key,
IXSEQ_TO_IPCID(id, shmids[id].u.shm_perm),
shmids[id].u.shm_perm.mode,
@@ -2256,9 +2256,9 @@ linprocfs_dosysvipc_shm(PFS_FILL_ARGS)
shmids[id].u.shm_perm.gid,
shmids[id].u.shm_perm.cuid,
shmids[id].u.shm_perm.cgid,
(long)shmids[id].u.shm_atime,
(long)shmids[id].u.shm_dtime,
(long)shmids[id].u.shm_ctime,
(long long)shmids[id].u.shm_atime,
(long long)shmids[id].u.shm_dtime,
(long long)shmids[id].u.shm_ctime,
0, 0); /* XXX rss & swp are not supported */
free(shmids, M_TEMP);