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_apple.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_apple.c')
| -rw-r--r-- | sys/geom/geom_apple.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/sys/geom/geom_apple.c b/sys/geom/geom_apple.c index 04f5cac..883fe70 100644 --- a/sys/geom/geom_apple.c +++ b/sys/geom/geom_apple.c @@ -166,7 +166,7 @@ g_apple_taste(struct g_class *mp, struct g_provider *pp, int insist) break; buf = g_read_data(cp, 0, sectorsize, &error); - if (buf == NULL || error != 0) + if (buf == NULL) break; /* @@ -188,7 +188,7 @@ g_apple_taste(struct g_class *mp, struct g_provider *pp, int insist) * Read in the first partition map */ buf = g_read_data(cp, sectorsize, sectorsize, &error); - if (buf == NULL || error != 0) + if (buf == NULL) break; /* @@ -206,7 +206,7 @@ g_apple_taste(struct g_class *mp, struct g_provider *pp, int insist) buf = g_read_data(cp, 2 * sectorsize, (NAPMPART - 1) * sectorsize, &error); - if (buf == NULL || error != 0) + if (buf == NULL) break; for (i = 1; i < NAPMPART; i++) { |
