Aren/NetBSD
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Handle cases in which the cpulabel pointer == NULL.

Browse Source
This commit is contained in:
leo 2001-04-24 06:15:42 +00:00
parent 1c3a62e066
commit 7488e821c5
1 changed files with 12 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
sys/arch/atari/atari/disksubr.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: disksubr.c,v 1.19 2000/11/20 08:24:13 chs Exp $ */ /* $NetBSD: disksubr.c,v 1.20 2001/04/24 06:15:42 leo Exp $ */
/* /*
* Copyright (c) 1995 Leo Weppelman. * Copyright (c) 1995 Leo Weppelman.
@ -139,7 +139,9 @@ readdisklabel(dev, strat, lp, clp)
{ {
int e; int e;
bzero(clp, sizeof *clp); if (clp != NULL)
bzero(clp, sizeof *clp);
else printf("Warning: clp == NULL\n");
/* /*
* Give some guaranteed validity to the disk label. * Give some guaranteed validity to the disk label.
@ -168,7 +170,7 @@ readdisklabel(dev, strat, lp, clp)
#ifdef DISKLABEL_NBDA #ifdef DISKLABEL_NBDA
/* Try the native NetBSD/Atari format first. */ /* Try the native NetBSD/Atari format first. */
e = bsd_label(dev, strat, lp, 0, &clp->cd_label); e = bsd_label(dev, strat, lp, 0, clp != NULL ? &clp->cd_label : NULL);
#endif #endif
#if 0 #if 0
/* Other label formats go here. */ /* Other label formats go here. */
@ -177,7 +179,7 @@ readdisklabel(dev, strat, lp, clp)
#endif #endif
#ifdef DISKLABEL_AHDI #ifdef DISKLABEL_AHDI
/* The unprotected AHDI format comes last. */ /* The unprotected AHDI format comes last. */
if (e > 0) if (e > 0 && (clp != NULL))
e = ahdi_label(dev, strat, lp, clp); e = ahdi_label(dev, strat, lp, clp);
#endif #endif
if (e < 0) if (e < 0)
@ -310,12 +312,12 @@ writedisklabel(dev, strat, lp, clp)
* +1 if no valid label was found. * +1 if no valid label was found.
*/ */
static int static int
bsd_label(dev, strat, label, blkno, offset) bsd_label(dev, strat, label, blkno, offsetp)
dev_t dev; dev_t dev;
void (*strat)(struct buf *); void (*strat)(struct buf *);
struct disklabel *label; struct disklabel *label;
u_int blkno, u_int blkno,
*offset; *offsetp;
{ {
struct buf *bp; struct buf *bp;
int rv; int rv;
@ -354,9 +356,10 @@ bsd_label(dev, strat, label, blkno, offset)
&& dl->d_magic == DISKMAGIC && dl->d_magic == DISKMAGIC
&& dkcksum(dl) == 0 && dkcksum(dl) == 0
) { ) {
*offset = (char *)dl - (char *)bb; if (offsetp != NULL)
*label = *dl; *offsetp = (char *)dl - (char *)bb;
rv = 0; *label = *dl;
rv = 0;
break; break;
} }
} }