From 589f956a14bfeafb626e76fb295b9f45ca5edd42 Mon Sep 17 00:00:00 2001
From: Pedro Gonnet <gonnet@google.com>
Date: Sat, 25 Jun 2016 20:50:00 +0200
Subject: [PATCH] fix errors introduced in merge.
---
src/engine.c | 6 +++---
src/part.c | 2 +-
2 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/src/engine.c b/src/engine.c
index 5100315199..b994f5a763 100644
--- a/src/engine.c
+++ b/src/engine.c
@@ -277,7 +277,7 @@ void engine_redistribute(struct engine *e) {
}
#ifdef SWIFT_DEBUG_CHECKS
- if (s->parts[k].gpart->id < 0)
+ if (s->parts[k].gpart->id_or_ned_offset >= 0)
error("Trying to link a partnerless gpart !");
#endif
@@ -467,11 +467,11 @@ void engine_redistribute(struct engine *e) {
/* Does this gpart have a partner ? */
if (gparts_new[k].id_or_neg_offset <= 0) {
- const size_t partner_index = offset_parts - gparts_new[k].id_or_neg_offset;
+ const ptrdiff_t partner_index = offset_parts - gparts_new[k].id_or_neg_offset;
/* Re-link */
gparts_new[k].id_or_neg_offset = -partner_index;
- parts[partner_index].gpart = &gparts_new[k];
+ parts_new[partner_index].gpart = &gparts_new[k];
}
}
diff --git a/src/part.c b/src/part.c
index 75adcbfca0..7634040adc 100644
--- a/src/part.c
+++ b/src/part.c
@@ -53,7 +53,7 @@ void part_relink_gparts(struct part *parts, size_t N, ptrdiff_t offset) {
*/
void part_relink_parts(struct gpart *gparts, size_t N, struct part *parts) {
for (size_t k = 0; k < N; k++) {
- if (gparts[k].id_or_neg_offset < 0) {
+ if (gparts[k].id_or_neg_offset <= 0) {
parts[-gparts[k].id_or_neg_offset].gpart = &gparts[k];
}
}
--
GitLab