[src/trunk]: src/libexec/lfs_cleanerd realloc pedant

[itojun <itojun%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/6a04702dce93
branches:  trunk
changeset: 552109:6a04702dce93
user:      itojun <itojun%NetBSD.org@localhost>
date:      Fri Sep 19 05:50:41 2003 +0000

description:
realloc pedant

diffstat:

 libexec/lfs_cleanerd/cleanerd.c |  21 ++++++++++++++++-----
 1 files changed, 16 insertions(+), 5 deletions(-)

diffs (57 lines):

diff -r f8b38eb88009 -r 6a04702dce93 libexec/lfs_cleanerd/cleanerd.c
--- a/libexec/lfs_cleanerd/cleanerd.c   Fri Sep 19 05:41:33 2003 +0000
+++ b/libexec/lfs_cleanerd/cleanerd.c   Fri Sep 19 05:50:41 2003 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: cleanerd.c,v 1.49 2003/08/07 09:46:43 agc Exp $        */
+/*     $NetBSD: cleanerd.c,v 1.50 2003/09/19 05:50:41 itojun Exp $     */
 
 /*-
  * Copyright (c) 1992, 1993
@@ -36,7 +36,7 @@
 #if 0
 static char sccsid[] = "@(#)cleanerd.c 8.5 (Berkeley) 6/10/95";
 #else
-__RCSID("$NetBSD: cleanerd.c,v 1.49 2003/08/07 09:46:43 agc Exp $");
+__RCSID("$NetBSD: cleanerd.c,v 1.50 2003/09/19 05:50:41 itojun Exp $");
 #endif
 #endif /* not lint */
 
@@ -713,6 +713,9 @@
        int num_blocks, i, j, error;
        int seg_isempty=0;
        unsigned long *lp;
+       struct seglist **nsegs;
+       caddr_t *nbuf;
+       BLOCK_INFO *nba;
 
        lfsp = &fsp->fi_lfs;
        sp = SEGUSE_ENTRY(lfsp, fsp->fi_segusep, id);
@@ -730,9 +733,14 @@
        }
 
        /* Add a new segment to the accumulated list */
+       nsegs = (struct seglist **)realloc(sbp->segs,
+           sizeof(struct seglist *) * (sbp->nsegs + 1));
+       nbuf = (caddr_t *)realloc(sbp->buf, sizeof(caddr_t) * (sbp->nsegs + 1));
+       if (!nsegs || !nbuf)
+               err(1, "realloc");
+       sbp->segs = nsegs;
+       sbp->buf = nbuf;
        sbp->nsegs++;
-       sbp->segs = (struct seglist **)realloc(sbp->segs, sizeof(struct seglist *) * sbp->nsegs);
-       sbp->buf = (caddr_t *)realloc(sbp->buf, sizeof(caddr_t) * sbp->nsegs);
        sbp->segs[sbp->nsegs - 1] = slp;
 
        /* map the segment into a buffer */
@@ -882,7 +890,10 @@
        }
 
        /* Add these blocks to the accumulated list */
-       sbp->ba = realloc(sbp->ba, (sbp->nb + num_blocks) * sizeof(BLOCK_INFO));
+       nba = realloc(sbp->ba, (sbp->nb + num_blocks) * sizeof(BLOCK_INFO));
+       if (!nba)
+               err(1, "realloc");
+       sbp->ba = nba;
        memcpy(sbp->ba + sbp->nb, tba, num_blocks * sizeof(BLOCK_INFO));
        sbp->nb += num_blocks;