use proper types for uids, gids

SCCS-vsn: sys/sys/acct.h 6.4
SCCS-vsn: sys/ufs/ffs/dinode.h 6.9
SCCS-vsn: sys/ufs/ffs/inode.h 6.9
SCCS-vsn: sys/ufs/ufs/dinode.h 6.9
SCCS-vsn: sys/ufs/ufs/inode.h 6.9
SCCS-vsn: sys/sys/proc.h 6.5
SCCS-vsn: sys/ufs/ffs/quota.h 6.3
SCCS-vsn: sys/ufs/ufs/quota.h 6.3
SCCS-vsn: sys/sys/stat.h 6.3

diff --git a/usr/src/sys/sys/acct.h b/usr/src/sys/sys/acct.h
index 751e39b..e644c16 100644 (file)
--- a/usr/src/sys/sys/acct.h
+++ b/usr/src/sys/sys/acct.h
@@ -3,7 +3,7 @@
  * All rights reserved.  The Berkeley software License Agreement
  * specifies the terms and conditions for redistribution.
  *
  * All rights reserved.  The Berkeley software License Agreement
  * specifies the terms and conditions for redistribution.
  *

- *     @(#)acct.h      6.3 (Berkeley) %G%
+ *     @(#)acct.h      6.4 (Berkeley) %G%

  */
 
 /*
  */
 
 /*


@@ -21,8 +21,8 @@ struct        acct
        comp_t  ac_stime;               /* Accounting system time */
        comp_t  ac_etime;               /* Accounting elapsed time */
        time_t  ac_btime;               /* Beginning time */
        comp_t  ac_stime;               /* Accounting system time */
        comp_t  ac_etime;               /* Accounting elapsed time */
        time_t  ac_btime;               /* Beginning time */

-       short   ac_uid;                 /* Accounting user ID */
-       short   ac_gid;                 /* Accounting group ID */
+       uid_t   ac_uid;                 /* Accounting user ID */
+       gid_t   ac_gid;                 /* Accounting group ID */

        short   ac_mem;                 /* average memory usage */
        comp_t  ac_io;                  /* number of disk IO blocks */
        dev_t   ac_tty;                 /* control typewriter */
        short   ac_mem;                 /* average memory usage */
        comp_t  ac_io;                  /* number of disk IO blocks */
        dev_t   ac_tty;                 /* control typewriter */

diff --git a/usr/src/sys/sys/proc.h b/usr/src/sys/sys/proc.h
index e918252..56f8006 100644 (file)
--- a/usr/src/sys/sys/proc.h
+++ b/usr/src/sys/sys/proc.h
@@ -3,7 +3,7 @@
  * All rights reserved.  The Berkeley software License Agreement
  * specifies the terms and conditions for redistribution.
  *
  * All rights reserved.  The Berkeley software License Agreement
  * specifies the terms and conditions for redistribution.
  *

- *     @(#)proc.h      6.4 (Berkeley) %G%
+ *     @(#)proc.h      6.5 (Berkeley) %G%

  */
 
 /*
  */
 
 /*


@@ -33,7 +33,7 @@ struct        proc {
        int     p_sigignore;    /* signals being ignored */
        int     p_sigcatch;     /* signals being caught by user */
        int     p_flag;
        int     p_sigignore;    /* signals being ignored */
        int     p_sigcatch;     /* signals being caught by user */
        int     p_flag;

-       short   p_uid;          /* user id, used to direct tty signals */
+       uid_t   p_uid;          /* user id, used to direct tty signals */

        short   p_pgrp;         /* name of process group leader */
        short   p_pid;          /* unique process id */
        short   p_ppid;         /* process id of parent */
        short   p_pgrp;         /* name of process group leader */
        short   p_pid;          /* unique process id */
        short   p_ppid;         /* process id of parent */

diff --git a/usr/src/sys/sys/stat.h b/usr/src/sys/sys/stat.h
index 0cb6aad..b349539 100644 (file)
--- a/usr/src/sys/sys/stat.h
+++ b/usr/src/sys/sys/stat.h
@@ -3,7 +3,7 @@
  * All rights reserved.  The Berkeley software License Agreement
  * specifies the terms and conditions for redistribution.
  *
  * All rights reserved.  The Berkeley software License Agreement
  * specifies the terms and conditions for redistribution.
  *

- *     @(#)stat.h      6.2 (Berkeley) %G%
+ *     @(#)stat.h      6.3 (Berkeley) %G%

  */
 
 struct stat
  */
 
 struct stat


@@ -12,8 +12,8 @@ struct        stat
        ino_t   st_ino;
        unsigned short st_mode;
        short   st_nlink;
        ino_t   st_ino;
        unsigned short st_mode;
        short   st_nlink;

-       short   st_uid;
-       short   st_gid;
+       uid_t   st_uid;
+       gid_t   st_gid;

        dev_t   st_rdev;
        off_t   st_size;
        time_t  st_atime;
        dev_t   st_rdev;
        off_t   st_size;
        time_t  st_atime;

diff --git a/usr/src/sys/ufs/ffs/dinode.h b/usr/src/sys/ufs/ffs/dinode.h
index 69c35dc..d112c3e 100644 (file)
--- a/usr/src/sys/ufs/ffs/dinode.h
+++ b/usr/src/sys/ufs/ffs/dinode.h
@@ -3,7 +3,7 @@
  * All rights reserved.  The Berkeley software License Agreement
  * specifies the terms and conditions for redistribution.
  *
  * All rights reserved.  The Berkeley software License Agreement
  * specifies the terms and conditions for redistribution.
  *

- *     @(#)dinode.h    6.8 (Berkeley) %G%
+ *     @(#)dinode.h    6.9 (Berkeley) %G%

  */
 
 /*
  */
 
 /*


@@ -40,8 +40,8 @@ struct inode {
        {
                u_short ic_mode;        /*  0: mode and type of file */
                short   ic_nlink;       /*  2: number of links to file */
        {
                u_short ic_mode;        /*  0: mode and type of file */
                short   ic_nlink;       /*  2: number of links to file */

-               short   ic_uid;         /*  4: owner's user id */
-               short   ic_gid;         /*  6: owner's group id */
+               uid_t   ic_uid;         /*  4: owner's user id */
+               gid_t   ic_gid;         /*  6: owner's group id */

                quad    ic_size;        /*  8: number of bytes in file */
                time_t  ic_atime;       /* 16: time last accessed */
                long    ic_atspare;
                quad    ic_size;        /*  8: number of bytes in file */
                time_t  ic_atime;       /* 16: time last accessed */
                long    ic_atspare;

diff --git a/usr/src/sys/ufs/ffs/inode.h b/usr/src/sys/ufs/ffs/inode.h
index 5b51bb9..d152644 100644 (file)
--- a/usr/src/sys/ufs/ffs/inode.h
+++ b/usr/src/sys/ufs/ffs/inode.h
@@ -3,7 +3,7 @@
  * All rights reserved.  The Berkeley software License Agreement
  * specifies the terms and conditions for redistribution.
  *
  * All rights reserved.  The Berkeley software License Agreement
  * specifies the terms and conditions for redistribution.
  *

- *     @(#)inode.h     6.8 (Berkeley) %G%
+ *     @(#)inode.h     6.9 (Berkeley) %G%

  */
 
 /*
  */
 
 /*


@@ -40,8 +40,8 @@ struct inode {
        {
                u_short ic_mode;        /*  0: mode and type of file */
                short   ic_nlink;       /*  2: number of links to file */
        {
                u_short ic_mode;        /*  0: mode and type of file */
                short   ic_nlink;       /*  2: number of links to file */

-               short   ic_uid;         /*  4: owner's user id */
-               short   ic_gid;         /*  6: owner's group id */
+               uid_t   ic_uid;         /*  4: owner's user id */
+               gid_t   ic_gid;         /*  6: owner's group id */

                quad    ic_size;        /*  8: number of bytes in file */
                time_t  ic_atime;       /* 16: time last accessed */
                long    ic_atspare;
                quad    ic_size;        /*  8: number of bytes in file */
                time_t  ic_atime;       /* 16: time last accessed */
                long    ic_atspare;

diff --git a/usr/src/sys/ufs/ffs/quota.h b/usr/src/sys/ufs/ffs/quota.h
index 5b1246d..98b73d4 100644 (file)
--- a/usr/src/sys/ufs/ffs/quota.h
+++ b/usr/src/sys/ufs/ffs/quota.h
@@ -3,7 +3,7 @@
  * All rights reserved.  The Berkeley software License Agreement
  * specifies the terms and conditions for redistribution.
  *
  * All rights reserved.  The Berkeley software License Agreement
  * specifies the terms and conditions for redistribution.
  *

- *     @(#)quota.h     6.2 (Berkeley) %G%
+ *     @(#)quota.h     6.3 (Berkeley) %G%

  */
 
 /*
  */
 
 /*


@@ -22,7 +22,7 @@
 struct quota {
        struct  quota *q_forw, *q_back; /* hash chain, MUST be first */
        short   q_cnt;                  /* ref count (# processes) */
 struct quota {
        struct  quota *q_forw, *q_back; /* hash chain, MUST be first */
        short   q_cnt;                  /* ref count (# processes) */

-       short   q_uid;                  /* real uid of owner */
+       uid_t   q_uid;                  /* real uid of owner */

        int     q_flags;                /* struct management flags */
 #define        Q_LOCK  0x01            /* quota struct locked (for disc i/o) */
 #define        Q_WANT  0x02            /* issue a wakeup when lock goes off */
        int     q_flags;                /* struct management flags */
 #define        Q_LOCK  0x01            /* quota struct locked (for disc i/o) */
 #define        Q_WANT  0x02            /* issue a wakeup when lock goes off */


@@ -90,7 +90,7 @@ struct        dquot {
 #define        DQ_BLKS         0x10            /* has been warned about blk limit */
 #define        DQ_INODS        0x20            /* has been warned about inode limit */
        short   dq_cnt;                 /* count of active references */
 #define        DQ_BLKS         0x10            /* has been warned about blk limit */
 #define        DQ_INODS        0x20            /* has been warned about inode limit */
        short   dq_cnt;                 /* count of active references */

-       short   dq_uid;                 /* user this applies to */
+       uid_t   dq_uid;                 /* user this applies to */

        dev_t   dq_dev;                 /* filesystem this relates to */
        struct dqblk dq_dqb;            /* actual usage & quotas */
 };
        dev_t   dq_dev;                 /* filesystem this relates to */
        struct dqblk dq_dqb;            /* actual usage & quotas */
 };

diff --git a/usr/src/sys/ufs/ufs/dinode.h b/usr/src/sys/ufs/ufs/dinode.h
index 69c35dc..d112c3e 100644 (file)
--- a/usr/src/sys/ufs/ufs/dinode.h
+++ b/usr/src/sys/ufs/ufs/dinode.h
@@ -3,7 +3,7 @@
  * All rights reserved.  The Berkeley software License Agreement
  * specifies the terms and conditions for redistribution.
  *
  * All rights reserved.  The Berkeley software License Agreement
  * specifies the terms and conditions for redistribution.
  *

- *     @(#)dinode.h    6.8 (Berkeley) %G%
+ *     @(#)dinode.h    6.9 (Berkeley) %G%

  */
 
 /*
  */
 
 /*


@@ -40,8 +40,8 @@ struct inode {
        {
                u_short ic_mode;        /*  0: mode and type of file */
                short   ic_nlink;       /*  2: number of links to file */
        {
                u_short ic_mode;        /*  0: mode and type of file */
                short   ic_nlink;       /*  2: number of links to file */

-               short   ic_uid;         /*  4: owner's user id */
-               short   ic_gid;         /*  6: owner's group id */
+               uid_t   ic_uid;         /*  4: owner's user id */
+               gid_t   ic_gid;         /*  6: owner's group id */

                quad    ic_size;        /*  8: number of bytes in file */
                time_t  ic_atime;       /* 16: time last accessed */
                long    ic_atspare;
                quad    ic_size;        /*  8: number of bytes in file */
                time_t  ic_atime;       /* 16: time last accessed */
                long    ic_atspare;

diff --git a/usr/src/sys/ufs/ufs/inode.h b/usr/src/sys/ufs/ufs/inode.h
index 5b51bb9..d152644 100644 (file)
--- a/usr/src/sys/ufs/ufs/inode.h
+++ b/usr/src/sys/ufs/ufs/inode.h
@@ -3,7 +3,7 @@
  * All rights reserved.  The Berkeley software License Agreement
  * specifies the terms and conditions for redistribution.
  *
  * All rights reserved.  The Berkeley software License Agreement
  * specifies the terms and conditions for redistribution.
  *

- *     @(#)inode.h     6.8 (Berkeley) %G%
+ *     @(#)inode.h     6.9 (Berkeley) %G%

  */
 
 /*
  */
 
 /*


@@ -40,8 +40,8 @@ struct inode {
        {
                u_short ic_mode;        /*  0: mode and type of file */
                short   ic_nlink;       /*  2: number of links to file */
        {
                u_short ic_mode;        /*  0: mode and type of file */
                short   ic_nlink;       /*  2: number of links to file */

-               short   ic_uid;         /*  4: owner's user id */
-               short   ic_gid;         /*  6: owner's group id */
+               uid_t   ic_uid;         /*  4: owner's user id */
+               gid_t   ic_gid;         /*  6: owner's group id */

                quad    ic_size;        /*  8: number of bytes in file */
                time_t  ic_atime;       /* 16: time last accessed */
                long    ic_atspare;
                quad    ic_size;        /*  8: number of bytes in file */
                time_t  ic_atime;       /* 16: time last accessed */
                long    ic_atspare;

diff --git a/usr/src/sys/ufs/ufs/quota.h b/usr/src/sys/ufs/ufs/quota.h
index 5b1246d..98b73d4 100644 (file)
--- a/usr/src/sys/ufs/ufs/quota.h
+++ b/usr/src/sys/ufs/ufs/quota.h
@@ -3,7 +3,7 @@
  * All rights reserved.  The Berkeley software License Agreement
  * specifies the terms and conditions for redistribution.
  *
  * All rights reserved.  The Berkeley software License Agreement
  * specifies the terms and conditions for redistribution.
  *

- *     @(#)quota.h     6.2 (Berkeley) %G%
+ *     @(#)quota.h     6.3 (Berkeley) %G%

  */
 
 /*
  */
 
 /*


@@ -22,7 +22,7 @@
 struct quota {
        struct  quota *q_forw, *q_back; /* hash chain, MUST be first */
        short   q_cnt;                  /* ref count (# processes) */
 struct quota {
        struct  quota *q_forw, *q_back; /* hash chain, MUST be first */
        short   q_cnt;                  /* ref count (# processes) */

-       short   q_uid;                  /* real uid of owner */
+       uid_t   q_uid;                  /* real uid of owner */

        int     q_flags;                /* struct management flags */
 #define        Q_LOCK  0x01            /* quota struct locked (for disc i/o) */
 #define        Q_WANT  0x02            /* issue a wakeup when lock goes off */
        int     q_flags;                /* struct management flags */
 #define        Q_LOCK  0x01            /* quota struct locked (for disc i/o) */
 #define        Q_WANT  0x02            /* issue a wakeup when lock goes off */


@@ -90,7 +90,7 @@ struct        dquot {
 #define        DQ_BLKS         0x10            /* has been warned about blk limit */
 #define        DQ_INODS        0x20            /* has been warned about inode limit */
        short   dq_cnt;                 /* count of active references */
 #define        DQ_BLKS         0x10            /* has been warned about blk limit */
 #define        DQ_INODS        0x20            /* has been warned about inode limit */
        short   dq_cnt;                 /* count of active references */

-       short   dq_uid;                 /* user this applies to */
+       uid_t   dq_uid;                 /* user this applies to */

        dev_t   dq_dev;                 /* filesystem this relates to */
        struct dqblk dq_dqb;            /* actual usage & quotas */
 };
        dev_t   dq_dev;                 /* filesystem this relates to */
        struct dqblk dq_dqb;            /* actual usage & quotas */
 };