aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichal Soltys <soltys@ziu.info>2013-02-14 16:51:45 +0100
committerMichal Soltys <soltys@ziu.info>2013-02-14 16:53:04 +0100
commitefcb57e2bec24c3a88bafe599f33e47f5f11069b (patch)
tree8f6984201a041f1a4f304de29eda4fec899a904d
parent8d1edf6dd36d52e89109e13e1e538c4e28bfa737 (diff)
downloadsyslinux-efcb57e2bec24c3a88bafe599f33e47f5f11069b.tar.gz
syslinux-efcb57e2bec24c3a88bafe599f33e47f5f11069b.tar.xz
syslinux-efcb57e2bec24c3a88bafe599f33e47f5f11069b.zip
com32/chain: add pi_errored() in partiter
Signed-off-by: Michal Soltys <soltys@ziu.info>
-rw-r--r--com32/chain/mangle.c4
-rw-r--r--com32/chain/partiter.h5
2 files changed, 7 insertions, 2 deletions
diff --git a/com32/chain/mangle.c b/com32/chain/mangle.c
index 136f3bc7..0523db54 100644
--- a/com32/chain/mangle.c
+++ b/com32/chain/mangle.c
@@ -559,7 +559,7 @@ int manglepe_hide(struct part_iter *miter)
}
}
- if (iter->status > PI_DONE)
+ if (pi_errored(iter))
goto bail;
/* last write */
@@ -628,7 +628,7 @@ int manglepe_fixchs(struct part_iter *miter)
}
}
- if (iter->status > PI_DONE)
+ if (pi_errored(iter))
goto bail;
/* last write */
diff --git a/com32/chain/partiter.h b/com32/chain/partiter.h
index cf52833a..813b9e63 100644
--- a/com32/chain/partiter.h
+++ b/com32/chain/partiter.h
@@ -103,6 +103,11 @@ extern const struct itertype * const typeraw;
struct part_iter *pi_begin(const struct disk_info *, int flags);
void pi_del(struct part_iter **);
+static inline int pi_errored(struct part_iter *iter)
+{
+ return iter->status > PI_DONE;
+}
+
/* inline virtuals */
static inline int pi_next(struct part_iter *iter)
{