Author: brooks
Date: Thu Nov  1 23:10:53 2018
New Revision: 340035
URL: https://svnweb.freebsd.org/changeset/base/340035

Log:
  Regent after r340034: Use mode_t when the documented signature does.
  
  Sponsored by: DARPA, AFRL
  Differential Revision:        https://reviews.freebsd.org/D17784

Modified:
  head/sys/compat/freebsd32/freebsd32_systrace_args.c
  head/sys/kern/systrace_args.c
  head/sys/sys/sysproto.h

Modified: head/sys/compat/freebsd32/freebsd32_systrace_args.c
==============================================================================
--- head/sys/compat/freebsd32/freebsd32_systrace_args.c Thu Nov  1 23:06:50 
2018        (r340034)
+++ head/sys/compat/freebsd32/freebsd32_systrace_args.c Thu Nov  1 23:10:53 
2018        (r340035)
@@ -54,7 +54,7 @@ systrace_args(int sysnum, void *params, uint64_t *uarg
                struct open_args *p = params;
                uarg[0] = (intptr_t) p->path; /* char * */
                iarg[1] = p->flags; /* int */
-               iarg[2] = p->mode; /* int */
+               iarg[2] = p->mode; /* mode_t */
                *n_args = 3;
                break;
        }
@@ -108,7 +108,7 @@ systrace_args(int sysnum, void *params, uint64_t *uarg
        case 15: {
                struct chmod_args *p = params;
                uarg[0] = (intptr_t) p->path; /* char * */
-               iarg[1] = p->mode; /* int */
+               iarg[1] = p->mode; /* mode_t */
                *n_args = 2;
                break;
        }
@@ -396,7 +396,7 @@ systrace_args(int sysnum, void *params, uint64_t *uarg
        /* umask */
        case 60: {
                struct umask_args *p = params;
-               iarg[0] = p->newmask; /* int */
+               iarg[0] = p->newmask; /* mode_t */
                *n_args = 1;
                break;
        }
@@ -692,7 +692,7 @@ systrace_args(int sysnum, void *params, uint64_t *uarg
        case 124: {
                struct fchmod_args *p = params;
                iarg[0] = p->fd; /* int */
-               iarg[1] = p->mode; /* int */
+               iarg[1] = p->mode; /* mode_t */
                *n_args = 2;
                break;
        }
@@ -732,7 +732,7 @@ systrace_args(int sysnum, void *params, uint64_t *uarg
        case 132: {
                struct mkfifo_args *p = params;
                uarg[0] = (intptr_t) p->path; /* char * */
-               iarg[1] = p->mode; /* int */
+               iarg[1] = p->mode; /* mode_t */
                *n_args = 2;
                break;
        }
@@ -770,7 +770,7 @@ systrace_args(int sysnum, void *params, uint64_t *uarg
        case 136: {
                struct mkdir_args *p = params;
                uarg[0] = (intptr_t) p->path; /* char * */
-               iarg[1] = p->mode; /* int */
+               iarg[1] = p->mode; /* mode_t */
                *n_args = 2;
                break;
        }
@@ -3329,7 +3329,7 @@ systrace_entry_setargdesc(int sysnum, int ndx, char *d
                        p = "int";
                        break;
                case 2:
-                       p = "int";
+                       p = "mode_t";
                        break;
                default:
                        break;
@@ -3414,7 +3414,7 @@ systrace_entry_setargdesc(int sysnum, int ndx, char *d
                        p = "userland char *";
                        break;
                case 1:
-                       p = "int";
+                       p = "mode_t";
                        break;
                default:
                        break;
@@ -3864,7 +3864,7 @@ systrace_entry_setargdesc(int sysnum, int ndx, char *d
        case 60:
                switch(ndx) {
                case 0:
-                       p = "int";
+                       p = "mode_t";
                        break;
                default:
                        break;
@@ -4353,7 +4353,7 @@ systrace_entry_setargdesc(int sysnum, int ndx, char *d
                        p = "int";
                        break;
                case 1:
-                       p = "int";
+                       p = "mode_t";
                        break;
                default:
                        break;
@@ -4418,7 +4418,7 @@ systrace_entry_setargdesc(int sysnum, int ndx, char *d
                        p = "userland char *";
                        break;
                case 1:
-                       p = "int";
+                       p = "mode_t";
                        break;
                default:
                        break;
@@ -4488,7 +4488,7 @@ systrace_entry_setargdesc(int sysnum, int ndx, char *d
                        p = "userland char *";
                        break;
                case 1:
-                       p = "int";
+                       p = "mode_t";
                        break;
                default:
                        break;

Modified: head/sys/kern/systrace_args.c
==============================================================================
--- head/sys/kern/systrace_args.c       Thu Nov  1 23:06:50 2018        
(r340034)
+++ head/sys/kern/systrace_args.c       Thu Nov  1 23:10:53 2018        
(r340035)
@@ -51,7 +51,7 @@ systrace_args(int sysnum, void *params, uint64_t *uarg
                struct open_args *p = params;
                uarg[0] = (intptr_t) p->path; /* char * */
                iarg[1] = p->flags; /* int */
-               iarg[2] = p->mode; /* int */
+               iarg[2] = p->mode; /* mode_t */
                *n_args = 3;
                break;
        }
@@ -105,7 +105,7 @@ systrace_args(int sysnum, void *params, uint64_t *uarg
        case 15: {
                struct chmod_args *p = params;
                uarg[0] = (intptr_t) p->path; /* char * */
-               iarg[1] = p->mode; /* int */
+               iarg[1] = p->mode; /* mode_t */
                *n_args = 2;
                break;
        }
@@ -393,7 +393,7 @@ systrace_args(int sysnum, void *params, uint64_t *uarg
        /* umask */
        case 60: {
                struct umask_args *p = params;
-               iarg[0] = p->newmask; /* int */
+               iarg[0] = p->newmask; /* mode_t */
                *n_args = 1;
                break;
        }
@@ -689,7 +689,7 @@ systrace_args(int sysnum, void *params, uint64_t *uarg
        case 124: {
                struct fchmod_args *p = params;
                iarg[0] = p->fd; /* int */
-               iarg[1] = p->mode; /* int */
+               iarg[1] = p->mode; /* mode_t */
                *n_args = 2;
                break;
        }
@@ -729,7 +729,7 @@ systrace_args(int sysnum, void *params, uint64_t *uarg
        case 132: {
                struct mkfifo_args *p = params;
                uarg[0] = (intptr_t) p->path; /* char * */
-               iarg[1] = p->mode; /* int */
+               iarg[1] = p->mode; /* mode_t */
                *n_args = 2;
                break;
        }
@@ -767,7 +767,7 @@ systrace_args(int sysnum, void *params, uint64_t *uarg
        case 136: {
                struct mkdir_args *p = params;
                uarg[0] = (intptr_t) p->path; /* char * */
-               iarg[1] = p->mode; /* int */
+               iarg[1] = p->mode; /* mode_t */
                *n_args = 2;
                break;
        }
@@ -3334,7 +3334,7 @@ systrace_entry_setargdesc(int sysnum, int ndx, char *d
                        p = "int";
                        break;
                case 2:
-                       p = "int";
+                       p = "mode_t";
                        break;
                default:
                        break;
@@ -3419,7 +3419,7 @@ systrace_entry_setargdesc(int sysnum, int ndx, char *d
                        p = "userland char *";
                        break;
                case 1:
-                       p = "int";
+                       p = "mode_t";
                        break;
                default:
                        break;
@@ -3869,7 +3869,7 @@ systrace_entry_setargdesc(int sysnum, int ndx, char *d
        case 60:
                switch(ndx) {
                case 0:
-                       p = "int";
+                       p = "mode_t";
                        break;
                default:
                        break;
@@ -4358,7 +4358,7 @@ systrace_entry_setargdesc(int sysnum, int ndx, char *d
                        p = "int";
                        break;
                case 1:
-                       p = "int";
+                       p = "mode_t";
                        break;
                default:
                        break;
@@ -4423,7 +4423,7 @@ systrace_entry_setargdesc(int sysnum, int ndx, char *d
                        p = "userland char *";
                        break;
                case 1:
-                       p = "int";
+                       p = "mode_t";
                        break;
                default:
                        break;
@@ -4493,7 +4493,7 @@ systrace_entry_setargdesc(int sysnum, int ndx, char *d
                        p = "userland char *";
                        break;
                case 1:
-                       p = "int";
+                       p = "mode_t";
                        break;
                default:
                        break;

Modified: head/sys/sys/sysproto.h
==============================================================================
--- head/sys/sys/sysproto.h     Thu Nov  1 23:06:50 2018        (r340034)
+++ head/sys/sys/sysproto.h     Thu Nov  1 23:10:53 2018        (r340035)
@@ -56,7 +56,7 @@ struct write_args {
 struct open_args {
        char path_l_[PADL_(char *)]; char * path; char path_r_[PADR_(char *)];
        char flags_l_[PADL_(int)]; int flags; char flags_r_[PADR_(int)];
-       char mode_l_[PADL_(int)]; int mode; char mode_r_[PADR_(int)];
+       char mode_l_[PADL_(mode_t)]; mode_t mode; char mode_r_[PADR_(mode_t)];
 };
 struct close_args {
        char fd_l_[PADL_(int)]; int fd; char fd_r_[PADR_(int)];
@@ -82,7 +82,7 @@ struct fchdir_args {
 };
 struct chmod_args {
        char path_l_[PADL_(char *)]; char * path; char path_r_[PADR_(char *)];
-       char mode_l_[PADL_(int)]; int mode; char mode_r_[PADR_(int)];
+       char mode_l_[PADL_(mode_t)]; mode_t mode; char mode_r_[PADR_(mode_t)];
 };
 struct chown_args {
        char path_l_[PADL_(char *)]; char * path; char path_r_[PADR_(char *)];
@@ -242,7 +242,7 @@ struct execve_args {
        char envv_l_[PADL_(char **)]; char ** envv; char envv_r_[PADR_(char 
**)];
 };
 struct umask_args {
-       char newmask_l_[PADL_(int)]; int newmask; char newmask_r_[PADR_(int)];
+       char newmask_l_[PADL_(mode_t)]; mode_t newmask; char 
newmask_r_[PADR_(mode_t)];
 };
 struct chroot_args {
        char path_l_[PADL_(char *)]; char * path; char path_r_[PADR_(char *)];
@@ -406,7 +406,7 @@ struct fchown_args {
 };
 struct fchmod_args {
        char fd_l_[PADL_(int)]; int fd; char fd_r_[PADR_(int)];
-       char mode_l_[PADL_(int)]; int mode; char mode_r_[PADR_(int)];
+       char mode_l_[PADL_(mode_t)]; mode_t mode; char mode_r_[PADR_(mode_t)];
 };
 struct setreuid_args {
        char ruid_l_[PADL_(int)]; int ruid; char ruid_r_[PADR_(int)];
@@ -426,7 +426,7 @@ struct flock_args {
 };
 struct mkfifo_args {
        char path_l_[PADL_(char *)]; char * path; char path_r_[PADR_(char *)];
-       char mode_l_[PADL_(int)]; int mode; char mode_r_[PADR_(int)];
+       char mode_l_[PADL_(mode_t)]; mode_t mode; char mode_r_[PADR_(mode_t)];
 };
 struct sendto_args {
        char s_l_[PADL_(int)]; int s; char s_r_[PADR_(int)];
@@ -448,7 +448,7 @@ struct socketpair_args {
 };
 struct mkdir_args {
        char path_l_[PADL_(char *)]; char * path; char path_r_[PADR_(char *)];
-       char mode_l_[PADL_(int)]; int mode; char mode_r_[PADR_(int)];
+       char mode_l_[PADL_(mode_t)]; mode_t mode; char mode_r_[PADR_(mode_t)];
 };
 struct rmdir_args {
        char path_l_[PADL_(char *)]; char * path; char path_r_[PADR_(char *)];
_______________________________________________
[email protected] mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "[email protected]"

Reply via email to