rename size_t to segsz_t for ANSI C

SCCS-vsn: sys/kern/init_main.c 7.27
SCCS-vsn: sys/kern/kern_exec.c 7.24
SCCS-vsn: sys/kern/kern_fork.c 7.15
SCCS-vsn: sys/sys/types.h 7.9
SCCS-vsn: sys/kern/sysv_shm.c 7.2

diff --git a/usr/src/sys/kern/init_main.c b/usr/src/sys/kern/init_main.c
index 60855f3..6bca5f1 100644 (file)
--- a/usr/src/sys/kern/init_main.c
+++ b/usr/src/sys/kern/init_main.c
@@ -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.
  *

- *     @(#)init_main.c 7.26 (Berkeley) %G%
+ *     @(#)init_main.c 7.27 (Berkeley) %G%

  */
 
 #include "param.h"
  */
 
 #include "param.h"


@@ -199,7 +199,7 @@ main(firstaddr)
        proc[0].p_szpt = CLSIZE;
        if (newproc(0)) {
                expand(clrnd((int)btoc(szicode)), 0);
        proc[0].p_szpt = CLSIZE;
        if (newproc(0)) {
                expand(clrnd((int)btoc(szicode)), 0);

-               (void) swpexpand(u.u_dsize, (size_t)0, &u.u_dmap, &u.u_smap);
+               (void) swpexpand(u.u_dsize, (segsz_t)0, &u.u_dmap, &u.u_smap);

                (void) copyout((caddr_t)icode, (caddr_t)0, (unsigned)szicode);
                /*
                 * Return goes to loc. 0 of user init
                (void) copyout((caddr_t)icode, (caddr_t)0, (unsigned)szicode);
                /*
                 * Return goes to loc. 0 of user init

diff --git a/usr/src/sys/kern/kern_exec.c b/usr/src/sys/kern/kern_exec.c
index 5090e58..6c9aa0b 100644 (file)
--- a/usr/src/sys/kern/kern_exec.c
+++ b/usr/src/sys/kern/kern_exec.c
@@ -14,7 +14,7 @@
  * IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
  * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
  *
  * IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
  * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
  *

- *     @(#)kern_exec.c 7.23 (Berkeley) %G%
+ *     @(#)kern_exec.c 7.24 (Berkeley) %G%

  */
 
 #include "param.h"
  */
 
 #include "param.h"


@@ -533,7 +533,7 @@ getxfile(vp, ep, flags, nargc, uid, gid, cred)
        struct ucred *cred;
 {
        register struct proc *p = u.u_procp;
        struct ucred *cred;
 {
        register struct proc *p = u.u_procp;

-       size_t ts, ds, ids, uds, ss;
+       segsz_t ts, ds, ids, uds, ss;

        off_t toff;
 
 #ifdef HPUXCOMPAT
        off_t toff;
 
 #ifdef HPUXCOMPAT


@@ -641,7 +641,7 @@ getxfile(vp, ep, flags, nargc, uid, gid, cred)
        if ((flags & SPAGV) && p->p_textp)
                vinifod(p, (struct fpte *)dptopte(p, 0),
                    PG_FTEXT, p->p_textp->x_vptr,
        if ((flags & SPAGV) && p->p_textp)
                vinifod(p, (struct fpte *)dptopte(p, 0),
                    PG_FTEXT, p->p_textp->x_vptr,

-                   (long)(1 + ts/CLSIZE), (size_t)btoc(ep->a_data));
+                   (long)(1 + ts/CLSIZE), (segsz_t)btoc(ep->a_data));

 
 #if defined(vax) || defined(tahoe)
        /* THIS SHOULD BE DONE AT A LOWER LEVEL, IF AT ALL */
 
 #if defined(vax) || defined(tahoe)
        /* THIS SHOULD BE DONE AT A LOWER LEVEL, IF AT ALL */

diff --git a/usr/src/sys/kern/kern_fork.c b/usr/src/sys/kern/kern_fork.c
index 459d214..96be208 100644 (file)
--- a/usr/src/sys/kern/kern_fork.c
+++ b/usr/src/sys/kern/kern_fork.c
@@ -14,7 +14,7 @@
  * IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
  * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
  *
  * IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
  * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
  *

- *     @(#)kern_fork.c 7.14 (Berkeley) %G%
+ *     @(#)kern_fork.c 7.15 (Berkeley) %G%

  */
 
 #include "param.h"
  */
 
 #include "param.h"


@@ -84,8 +84,8 @@ fork1(isvfork)
        if (p2==NULL || (u.u_uid!=0 && (p2->p_nxt == NULL || a>MAXUPRC))) {
                u.u_error = EAGAIN;
                if (!isvfork) {
        if (p2==NULL || (u.u_uid!=0 && (p2->p_nxt == NULL || a>MAXUPRC))) {
                u.u_error = EAGAIN;
                if (!isvfork) {

-                       (void) vsexpand((size_t)0, &u.u_cdmap, 1);
-                       (void) vsexpand((size_t)0, &u.u_csmap, 1);
+                       (void) vsexpand((segsz_t)0, &u.u_cdmap, 1);
+                       (void) vsexpand((segsz_t)0, &u.u_csmap, 1);

                }
                goto out;
        }
                }
                goto out;
        }

diff --git a/usr/src/sys/kern/sysv_shm.c b/usr/src/sys/kern/sysv_shm.c
index ab87f79..81937e2 100644 (file)
--- a/usr/src/sys/kern/sysv_shm.c
+++ b/usr/src/sys/kern/sysv_shm.c
@@ -11,7 +11,7 @@
  *
  * from: Utah $Hdr: uipc_shm.c 1.9 89/08/14$
  *
  *
  * from: Utah $Hdr: uipc_shm.c 1.9 89/08/14$
  *

- *     @(#)sysv_shm.c  7.1 (Berkeley) %G%
+ *     @(#)sysv_shm.c  7.2 (Berkeley) %G%

  */
 
 /*
  */
 
 /*


@@ -289,7 +289,7 @@ shmat(ap)
        prot |= MM_CI;
 #endif
        size = ctob(clrnd(btoc(shp->shm_segsz)));
        prot |= MM_CI;
 #endif
        size = ctob(clrnd(btoc(shp->shm_segsz)));

-       mp = mmalloc(uap->shmid, &uva, (size_t)size, prot, &shmops);
+       mp = mmalloc(uap->shmid, &uva, (segsz_t)size, prot, &shmops);

        if (mp == MMNIL)
                return;
        if (!mmmapin(mp, shmmapin)) {
        if (mp == MMNIL)
                return;
        if (!mmmapin(mp, shmmapin)) {

diff --git a/usr/src/sys/sys/types.h b/usr/src/sys/sys/types.h
index 02e384a..20b62b2 100644 (file)
--- a/usr/src/sys/sys/types.h
+++ b/usr/src/sys/sys/types.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.
  *

- *     @(#)types.h     7.8 (Berkeley) %G%
+ *     @(#)types.h     7.9 (Berkeley) %G%

  */
 
 #ifndef _TYPES_
  */
 
 #ifndef _TYPES_


@@ -46,7 +46,7 @@ typedef       char *  caddr_t;
 typedef        long *  qaddr_t;        /* should be typedef quad * qaddr_t; */
 typedef        u_long  ino_t;
 typedef        long    swblk_t;
 typedef        long *  qaddr_t;        /* should be typedef quad * qaddr_t; */
 typedef        u_long  ino_t;
 typedef        long    swblk_t;

-typedef        long    size_t;
+typedef        long    segsz_t;

 typedef        long    time_t;
 typedef        u_long  clock_t;
 typedef        short   dev_t;
 typedef        long    time_t;
 typedef        u_long  clock_t;
 typedef        short   dev_t;