From e051aa66347c0254b77b2171289c0bb2b1073fcc Mon Sep 17 00:00:00 2001
From: Etienne Brateau <etienne.brateau@ensiie.fr>
Date: Wed, 23 Jan 2019 22:50:53 +0100
Subject: [PATCH] pagenull: change parameter type to log_page
---
include/page.h | 2 +-
src/log.c | 2 +-
src/page.c | 6 +++---
3 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/include/page.h b/include/page.h
index e4d0035..b4c86f2 100644
--- a/include/page.h
+++ b/include/page.h
@@ -32,7 +32,7 @@ void chpageplace(log_page *page, short x1, short y1, short x2, short y2);
int isPageEmpty(log_page *page);
-int pagenull(short pg);
+int pagenull(log_page *page);
int pagechanged(short pg);
diff --git a/src/log.c b/src/log.c
index 4acbc61..84d0e5e 100644
--- a/src/log.c
+++ b/src/log.c
@@ -2533,7 +2533,7 @@ static void setupregion(log_regrec **r, short pagenum)
}
Free(*r);
}
- while (gg.numpages > gg.curpage && pagenull((int)gg.numpages))
+ while (gg.numpages > gg.curpage && pagenull(gg.pages[gg.numpages - 1]))
gg.numpages--;
return;
}
diff --git a/src/page.c b/src/page.c
index 3f4795f..85c1bda 100644
--- a/src/page.c
+++ b/src/page.c
@@ -50,9 +50,9 @@ int isPageEmpty(log_page *page)
}
-int pagenull(short pg)
+int pagenull(log_page *page)
{
- return (isPageEmpty(gg.pages[pg - 1]) && gg.pages[pg - 1]->pageregions == NULL);
+ return (isPageEmpty(page) && page->pageregions == NULL);
}
int pagechanged(short pg)
@@ -111,7 +111,7 @@ void newpage(short pg)
gg.curpage = pg;
realcurpage = pg;
}
- while (gg.numpages > gg.curpage && pagenull((int)gg.numpages))
+ while (gg.numpages > gg.curpage && pagenull(gg.pages[gg.numpages - 1]))
gg.numpages--;
}
--
GitLab