[syslinux:elflink] com32/chain: add pi_errored() in partiter

syslinux-bot for Michal Soltys soltys at ziu.info
Sat Feb 16 01:48:10 PST 2013


Commit-ID:  efcb57e2bec24c3a88bafe599f33e47f5f11069b
Gitweb:     http://www.syslinux.org/commit/efcb57e2bec24c3a88bafe599f33e47f5f11069b
Author:     Michal Soltys <soltys at ziu.info>
AuthorDate: Thu, 14 Feb 2013 16:51:45 +0100
Committer:  Michal Soltys <soltys at ziu.info>
CommitDate: Thu, 14 Feb 2013 16:53:04 +0100

com32/chain: add pi_errored() in partiter

Signed-off-by: Michal Soltys <soltys at ziu.info>

---
 com32/chain/mangle.c   | 4 ++--
 com32/chain/partiter.h | 5 +++++
 2 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/com32/chain/mangle.c b/com32/chain/mangle.c
index 136f3bc..0523db5 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 cf52833..813b9e6 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)
 {


More information about the Syslinux-commits mailing list