svn commit: r317283 - head/sbin/fsck_ffs
Pedro F. Giffuni
pfg at FreeBSD.org
Sat Apr 22 14:50:13 UTC 2017
Author: pfg
Date: Sat Apr 22 14:50:11 2017
New Revision: 317283
URL: https://svnweb.freebsd.org/changeset/base/317283
Log:
fsck_ffs: Unsign some variables and make use of reallocarray(3).
Instead of casting listmax and numdirs to unsigned values just define
them as unsigned and avoid the casts. Use reallocarray(3).
While here, fs_ncg is already unsigned so the cast is unnecessary.
Reviewed by: mckusick
MFC after: 2 weeks
Modified:
head/sbin/fsck_ffs/fsck.h
head/sbin/fsck_ffs/globs.c
head/sbin/fsck_ffs/inode.c
head/sbin/fsck_ffs/setup.c
Modified: head/sbin/fsck_ffs/fsck.h
==============================================================================
--- head/sbin/fsck_ffs/fsck.h Sat Apr 22 13:04:36 2017 (r317282)
+++ head/sbin/fsck_ffs/fsck.h Sat Apr 22 14:50:11 2017 (r317283)
@@ -282,7 +282,8 @@ struct inoinfo {
u_int i_numblks; /* size of block array in bytes */
ufs2_daddr_t i_blks[1]; /* actually longer */
} **inphead, **inpsort;
-extern long numdirs, dirhash, listmax, inplast;
+extern long dirhash, inplast;
+extern unsigned long numdirs, listmax;
extern long countdirs; /* number of directories we actually found */
#define MIBSIZE 3 /* size of fsck sysctl MIBs */
Modified: head/sbin/fsck_ffs/globs.c
==============================================================================
--- head/sbin/fsck_ffs/globs.c Sat Apr 22 13:04:36 2017 (r317282)
+++ head/sbin/fsck_ffs/globs.c Sat Apr 22 14:50:11 2017 (r317283)
@@ -56,7 +56,8 @@ struct bufarea sblk; /* file system sup
struct bufarea *pdirbp; /* current directory contents */
struct bufarea *pbp; /* current inode block */
ino_t cursnapshot;
-long numdirs, dirhash, listmax, inplast;
+long dirhash, inplast;
+unsigned long numdirs, listmax;
long countdirs; /* number of directories we actually found */
int adjrefcnt[MIBSIZE]; /* MIB command to adjust inode reference cnt */
int adjblkcnt[MIBSIZE]; /* MIB command to adjust inode block count */
@@ -123,7 +124,7 @@ fsckinit(void)
pdirbp = NULL;
pbp = NULL;
cursnapshot = 0;
- numdirs = dirhash = listmax = inplast = 0;
+ listmax = numdirs = dirhash = inplast = 0;
countdirs = 0;
bzero(adjrefcnt, sizeof(int) * MIBSIZE);
bzero(adjblkcnt, sizeof(int) * MIBSIZE);
Modified: head/sbin/fsck_ffs/inode.c
==============================================================================
--- head/sbin/fsck_ffs/inode.c Sat Apr 22 13:04:36 2017 (r317282)
+++ head/sbin/fsck_ffs/inode.c Sat Apr 22 14:50:11 2017 (r317283)
@@ -472,8 +472,8 @@ cacheino(union dinode *dp, ino_t inumber
inp->i_blks[UFS_NDADDR + i] = DIP(dp, di_ib[i]);
if (inplast == listmax) {
listmax += 100;
- inpsort = (struct inoinfo **)realloc((char *)inpsort,
- (unsigned)listmax * sizeof(struct inoinfo *));
+ inpsort = (struct inoinfo **)reallocarray((char *)inpsort,
+ listmax, sizeof(struct inoinfo *));
if (inpsort == NULL)
errx(EEXIT, "cannot increase directory list");
}
Modified: head/sbin/fsck_ffs/setup.c
==============================================================================
--- head/sbin/fsck_ffs/setup.c Sat Apr 22 13:04:36 2017 (r317282)
+++ head/sbin/fsck_ffs/setup.c Sat Apr 22 14:50:11 2017 (r317283)
@@ -268,8 +268,7 @@ setup(char *dev)
(unsigned)bmapsize);
goto badsb;
}
- inostathead = Calloc((unsigned)(sblock.fs_ncg),
- sizeof(struct inostatlist));
+ inostathead = Calloc(sblock.fs_ncg, sizeof(struct inostatlist));
if (inostathead == NULL) {
printf("cannot alloc %u bytes for inostathead\n",
(unsigned)(sizeof(struct inostatlist) * (sblock.fs_ncg)));
@@ -279,10 +278,8 @@ setup(char *dev)
dirhash = numdirs;
inplast = 0;
listmax = numdirs + 10;
- inpsort = (struct inoinfo **)Calloc((unsigned)listmax,
- sizeof(struct inoinfo *));
- inphead = (struct inoinfo **)Calloc((unsigned)numdirs,
- sizeof(struct inoinfo *));
+ inpsort = (struct inoinfo **)Calloc(listmax, sizeof(struct inoinfo *));
+ inphead = (struct inoinfo **)Calloc(numdirs, sizeof(struct inoinfo *));
if (inpsort == NULL || inphead == NULL) {
printf("cannot alloc %ju bytes for inphead\n",
(uintmax_t)numdirs * sizeof(struct inoinfo *));
More information about the svn-src-all
mailing list