Page MenuHomeFreeBSD
Files F161315654

D9428.id24686.diff
No OneTemporary
Actions

D9428.id24686.diff
View Options

Index: sys/compat/freebsd32/freebsd32_systrace_args.c
===================================================================
--- sys/compat/freebsd32/freebsd32_systrace_args.c
+++ sys/compat/freebsd32/freebsd32_systrace_args.c
@@ -1578,7 +1578,7 @@
case 326: {
struct __getcwd_args *p = params;
uarg[0] = (intptr_t) p->buf; /* char * */
- uarg[1] = p->buflen; /* u_int */
+ uarg[1] = p->buflen; /* size_t */
*n_args = 2;
break;
}
@@ -5809,7 +5809,7 @@
p = "userland char *";
break;
case 1:
- p = "u_int";
+ p = "size_t";
break;
default:
break;
Index: sys/compat/freebsd32/syscalls.master
===================================================================
--- sys/compat/freebsd32/syscalls.master
+++ sys/compat/freebsd32/syscalls.master
@@ -583,7 +583,7 @@
323 AUE_NULL OBSOL thr_wakeup
324 AUE_MLOCKALL NOPROTO { int mlockall(int how); }
325 AUE_MUNLOCKALL NOPROTO { int munlockall(void); }
-326 AUE_GETCWD NOPROTO { int __getcwd(char *buf, u_int buflen); }
+326 AUE_GETCWD NOPROTO { int __getcwd(char *buf, size_t buflen); }
327 AUE_NULL NOPROTO { int sched_setparam (pid_t pid, \
const struct sched_param *param); }
Index: sys/kern/syscalls.master
===================================================================
--- sys/kern/syscalls.master
+++ sys/kern/syscalls.master
@@ -571,7 +571,7 @@
323 AUE_NULL OBSOL thr_wakeup
324 AUE_MLOCKALL STD { int mlockall(int how); }
325 AUE_MUNLOCKALL STD { int munlockall(void); }
-326 AUE_GETCWD STD { int __getcwd(char *buf, u_int buflen); }
+326 AUE_GETCWD STD { int __getcwd(char *buf, size_t buflen); }
327 AUE_NULL STD { int sched_setparam (pid_t pid, \
const struct sched_param *param); }
Index: sys/kern/systrace_args.c
===================================================================
--- sys/kern/systrace_args.c
+++ sys/kern/systrace_args.c
@@ -1612,7 +1612,7 @@
case 326: {
struct __getcwd_args *p = params;
uarg[0] = (intptr_t) p->buf; /* char * */
- uarg[1] = p->buflen; /* u_int */
+ uarg[1] = p->buflen; /* size_t */
*n_args = 2;
break;
}
@@ -5872,7 +5872,7 @@
p = "userland char *";
break;
case 1:
- p = "u_int";
+ p = "size_t";
break;
default:
break;
Index: sys/kern/vfs_cache.c
===================================================================
--- sys/kern/vfs_cache.c
+++ sys/kern/vfs_cache.c
@@ -2045,8 +2045,8 @@
}
int
-kern___getcwd(struct thread *td, char *buf, enum uio_seg bufseg, u_int buflen,
- u_int path_max)
+kern___getcwd(struct thread *td, char *buf, enum uio_seg bufseg, size_t buflen,
+ size_t path_max)
{
char *bp, *tmpbuf;
struct filedesc *fdp;
Index: sys/sys/syscallsubr.h
===================================================================
--- sys/sys/syscallsubr.h
+++ sys/sys/syscallsubr.h
@@ -59,7 +59,7 @@
struct __wrusage;
int kern___getcwd(struct thread *td, char *buf, enum uio_seg bufseg,
- u_int buflen, u_int path_max);
+ size_t buflen, size_t path_max);
int kern_accept(struct thread *td, int s, struct sockaddr **name,
socklen_t *namelen, struct file **fp);
int kern_accept4(struct thread *td, int s, struct sockaddr **name,
Index: sys/sys/sysproto.h
===================================================================
--- sys/sys/sysproto.h
+++ sys/sys/sysproto.h
@@ -850,7 +850,7 @@
};
struct __getcwd_args {
char buf_l_[PADL_(char *)]; char * buf; char buf_r_[PADR_(char *)];
- char buflen_l_[PADL_(u_int)]; u_int buflen; char buflen_r_[PADR_(u_int)];
+ char buflen_l_[PADL_(size_t)]; size_t buflen; char buflen_r_[PADR_(size_t)];
};
struct sched_setparam_args {
char pid_l_[PADL_(pid_t)]; pid_t pid; char pid_r_[PADR_(pid_t)];

File Metadata

Mime Type
text/plain
Expires
Fri, Jul 3, 5:44 PM (11 h, 24 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
34632453
Default Alt Text
D9428.id24686.diff (3 KB)

Event Timeline