From 82e1d1f3fcfc71d5eda9d7b728b566b7680a7be4 Mon Sep 17 00:00:00 2001
From: Etienne Brateau <etienne.brateau@ensiie.fr>
Date: Wed, 23 Jan 2019 23:17:21 +0100
Subject: [PATCH] page: rename some fumctions and free allocated pages before
end of main
---
include/page.h | 6 ++----
src/log.c | 9 ++++++++-
src/page.c | 4 ++--
3 files changed, 12 insertions(+), 7 deletions(-)
diff --git a/include/page.h b/include/page.h
index 421118f..dcdfa1d 100644
--- a/include/page.h
+++ b/include/page.h
@@ -42,10 +42,8 @@ void newpage(short pg);
int pagembb(short pg, short *x1, short *y1, short *x2, short *y2);
-/* new functions */
+log_page *pageAlloc();
-log_page *page_alloc();
-
-void page_free(log_page **page);
+void pageFree(log_page **page);
#endif
diff --git a/src/log.c b/src/log.c
index 662785d..2377de6 100644
--- a/src/log.c
+++ b/src/log.c
@@ -14360,7 +14360,7 @@ static void initialize()
clearalpha();
for(int i = 0; i < log_maxpages; ++i)
- gg.pages[i] = page_alloc();
+ gg.pages[i] = pageAlloc();
gg.numpages = 1;
gg.curpage = 1;
gg.showpage = 1;
@@ -14512,6 +14512,12 @@ static void initialize()
#undef rtn
+static void cleanlog()
+{
+ for(int i = 0; i < log_maxpages; ++i)
+ pageFree(&gg.pages[i]);
+}
+
static void shownews()
{
@@ -14956,6 +14962,7 @@ int main(int argc, char * argv[])
nk_setcapslock(entrycapslock);
nk_settransarray(nk_ktstandard, &curkeytrans);
showalpha();
+ cleanlog();
if (dumpfile != NULL)
fclose(dumpfile);
if (tracefile != NULL)
diff --git a/src/page.c b/src/page.c
index f33c1a9..75e3061 100644
--- a/src/page.c
+++ b/src/page.c
@@ -202,7 +202,7 @@ int pagembb(short pg, short *x1, short *y1, short *x2, short *y2)
return (*x1 < *x2);
}
-log_page *page_alloc()
+log_page *pageAlloc()
{
log_page *newpage = Malloc(sizeof(log_page));
@@ -219,7 +219,7 @@ log_page *page_alloc()
return newpage;
}
-void page_free(log_page **page)
+void pageFree(log_page **page)
{
Free(*page);
*page = NULL;
--
GitLab