Don't cast the return from calloc()

[openafs.git] / src / vfsck / setup.c

diff --git a/src/vfsck/setup.c b/src/vfsck/setup.c
index 49cbd5c..5a3cd12 100644 (file)
--- a/src/vfsck/setup.c
+++ b/src/vfsck/setup.c
@@ -100,7 +100,6 @@ struct bufarea *pbp;
     /* inode map */    howmany((fs)->fs_ipg, NBBY) + \
     /* block map */    howmany((fs)->fs_cpg * (fs)->fs_spc / NSPF(fs), NBBY))
 
-char *malloc(), *calloc();
 struct disklabel *getdisklabel();
 
 setup(dev)
@@ -474,7 +473,7 @@ setup(dev)
      * read in the summary info.
      */
     asked = 0;
-#if    defined(AFS_SUN56_ENV)
+#if    defined(AFS_SUN5_ENV)
     {
        caddr_t sip;
        sip = calloc(1, sblock.fs_cssize);
@@ -495,10 +494,10 @@ setup(dev)
            sip += size;
        }
     }
-#else /* AFS_SUN56_ENV */
+#else /* AFS_SUN5_ENV */
 #if     defined(AFS_HPUX110_ENV)
     size = fragroundup(&sblock, sblock.fs_cssize);
-    sblock.fs_csp = (struct csum *)calloc(1, (unsigned)size);
+    sblock.fs_csp = calloc(1, (unsigned)size);
     if ((bread
         (fsreadfd, (char *)sblock.fs_csp, fsbtodb(&sblock, sblock.fs_csaddr),
          size) != 0) && !asked) {
@@ -518,7 +517,7 @@ setup(dev)
            sblock.fs_cssize - i <
            sblock.fs_bsize ? sblock.fs_cssize - i : sblock.fs_bsize;
 #endif /* AFS_HPUX101_ENV */
-       sblock.fs_csp[j] = (struct csum *)calloc(1, (unsigned)size);
+       sblock.fs_csp[j] = calloc(1, (unsigned)size);
        if (bread
            (fsreadfd, (char *)sblock.fs_csp[j],
             fsbtodb(&sblock, sblock.fs_csaddr + j * sblock.fs_frag),
@@ -534,7 +533,7 @@ setup(dev)
        }
     }
 #endif /* else AFS_HPUX110_ENV */
-#endif /* else AFS_SUN56_ENV */
+#endif /* else AFS_SUN5_ENV */
 
 #if    defined(AFS_SUN_ENV) && !defined(AFS_SUN3_ENV)
     /*
@@ -575,7 +574,7 @@ setup(dev)
        msgprintf("cannot alloc %d bytes for statemap\n", maxino + 1);
        goto badsb;
     }
-    lncntp = (short *)calloc((unsigned)(maxino + 1), sizeof(short));
+    lncntp = calloc((unsigned)(maxino + 1), sizeof(short));
     if (lncntp == NULL) {
        msgprintf("cannot alloc %d bytes for lncntp\n",
                  (maxino + 1) * sizeof(short));
@@ -691,14 +690,14 @@ readsb(listerr)
     altsblock.fs_optim = sblock.fs_optim;
     altsblock.fs_rotdelay = sblock.fs_rotdelay;
     altsblock.fs_maxbpg = sblock.fs_maxbpg;
-#if    !defined(__alpha) && !defined(AFS_SUN56_ENV)
+#if    !defined(__alpha) && !defined(AFS_SUN5_ENV)
 #if !defined(AFS_HPUX110_ENV)
     /* HPUX110 will use UpdateAlternateSuper() below */
     memcpy((char *)altsblock.fs_csp, (char *)sblock.fs_csp,
           sizeof sblock.fs_csp);
 #endif /* ! AFS_HPUX110_ENV */
 #endif /* ! __alpha */
-#if    defined(AFS_SUN56_ENV)
+#if    defined(AFS_SUN5_ENV)
     memcpy((char *)altsblock.fs_u.fs_csp_pad, (char *)sblock.fs_u.fs_csp_pad,
           sizeof(sblock.fs_u.fs_csp_pad));
 #endif