diff options
| author | sobomax <sobomax@FreeBSD.org> | 2005-11-30 19:24:51 +0000 |
|---|---|---|
| committer | sobomax <sobomax@FreeBSD.org> | 2005-11-30 19:24:51 +0000 |
| commit | 29543921eae6a40180f2f784021ed1b42d328e2a (patch) | |
| tree | 81ef73354089000f24e964c7cdffc0035dfe7d01 /sys/geom/geom_mbr.c | |
| parent | 937b629bd5f0ccf20166962cb9ec63905573b02c (diff) | |
| download | FreeBSD-src-29543921eae6a40180f2f784021ed1b42d328e2a.zip FreeBSD-src-29543921eae6a40180f2f784021ed1b42d328e2a.tar.gz | |
Check for g_read_data(9) errors properly:
o The only indication of error condition is NULL value returned by
the function;
o value pointed to by error argument is undefined in the case when
operation completes successfully.
Discussed with: phk
Diffstat (limited to 'sys/geom/geom_mbr.c')
| -rw-r--r-- | sys/geom/geom_mbr.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sys/geom/geom_mbr.c b/sys/geom/geom_mbr.c index 9fbb3c7..218517e 100644 --- a/sys/geom/geom_mbr.c +++ b/sys/geom/geom_mbr.c @@ -284,7 +284,7 @@ g_mbr_taste(struct g_class *mp, struct g_provider *pp, int insist) break; ms->sectorsize = sectorsize; buf = g_read_data(cp, 0, sectorsize, &error); - if (buf == NULL || error != 0) + if (buf == NULL) break; /* @@ -454,7 +454,7 @@ g_mbrext_taste(struct g_class *mp, struct g_provider *pp, int insist __unused) break; for (;;) { buf = g_read_data(cp, off, sectorsize, &error); - if (buf == NULL || error != 0) + if (buf == NULL) break; if (buf[0x1fe] != 0x55 && buf[0x1ff] != 0xaa) { g_free(buf); |
