From d8a4ed176bf20320d8f7d5be2b3596b01ca87c93 Mon Sep 17 00:00:00 2001
From: Etienne Brateau <etienne.brateau@ensiie.fr>
Date: Tue, 26 Feb 2019 22:38:22 +0100
Subject: [PATCH] Remove some unused parameters
---
include/configreader.h | 6 +++---
src/configreader.c | 12 ++++++------
src/log.c | 22 +++++++++++-----------
3 files changed, 20 insertions(+), 20 deletions(-)
diff --git a/include/configreader.h b/include/configreader.h
index 271805e..233ab86 100644
--- a/include/configreader.h
+++ b/include/configreader.h
@@ -3,9 +3,9 @@
#include "pagereader.h"
-void beginfatal(struct LOC_initialize *LINK);
-void endfatal(struct LOC_initialize *LINK);
-void sethomedirname(char *dir_, struct LOC_initialize *LINK);
+void beginfatal();
+void endfatal();
+void sethomedirname(char *dir_);
void addgatesfile(char *fn_, struct LOC_initialize *LINK);
void readcnf(char *fn, struct LOC_initialize* LINK);
diff --git a/src/configreader.c b/src/configreader.c
index 153231f..3cce8bc 100644
--- a/src/configreader.c
+++ b/src/configreader.c
@@ -16,7 +16,7 @@ static void removepath(char *name)
strcpy_overlap(name, cp + 1);
}
-void beginfatal(struct LOC_initialize *LINK)
+void beginfatal()
{
if (P_escapecode == -20)
_Escape(P_escapecode);
@@ -24,14 +24,14 @@ void beginfatal(struct LOC_initialize *LINK)
nc_printf("\n\n%c", chryellow);
}
-void endfatal(struct LOC_initialize *LINK)
+void endfatal()
{
nc_printf("%c Program aborted.\n", chrgreen);
_Escape(0);
}
-void sethomedirname(char *dir_, struct LOC_initialize *LINK)
+void sethomedirname(char *dir_)
{
char dir[256];
char *ep;
@@ -195,7 +195,7 @@ void readcnf(char *fn_, struct LOC_initialize *LINK)
}
if (!strcmp(LINK->cmdbuf, "HOME"))
{
- sethomedirname(txbuf, LINK);
+ sethomedirname(txbuf);
continue;
}
if (!strcmp(LINK->cmdbuf, "GATES"))
@@ -371,9 +371,9 @@ void readcnf(char *fn_, struct LOC_initialize *LINK)
if (P_escapecode != 0)
{
- beginfatal(LINK);
+ beginfatal();
nc_printf("Error in line %ld of configuration file \"%s\"\n", cnflin, fn);
- endfatal(LINK);
+ endfatal();
}
ENDTRY(try33);
}
diff --git a/src/log.c b/src/log.c
index b85fc96..7730133 100644
--- a/src/log.c
+++ b/src/log.c
@@ -11398,13 +11398,13 @@ static void initialize()
if (swtab[5].used > 0)
{
if (*swtab[5].UU.s == '\0')
- sethomedirname("", &V);
+ sethomedirname("");
else
- sethomedirname(swtab[5].UU.s, &V);
+ sethomedirname(swtab[5].UU.s);
}
else
{
- sethomedirname("~/log", &V);
+ sethomedirname("~/log");
}
cursorhide = false;
initmenus();
@@ -11494,9 +11494,9 @@ static void initialize()
RECOVER(try34);
if (P_escapecode == -20)
_Escape(P_escapecode);
- beginfatal(&V);
+ beginfatal();
nc_printf("Can't find graphics tablet!\n");
- endfatal(&V);
+ endfatal();
ENDTRY(try34);
if (gatefilenames == NULL)
addgatesfile("log", &V);
@@ -11587,17 +11587,17 @@ static void initialize()
RECOVER2(try35,_Ltry35);
if (P_escapecode == -20)
_Escape(P_escapecode);
- beginfatal(&V);
+ beginfatal();
nc_printf("Can't open gates file \"%s\"\n", gatesname[k]);
- endfatal(&V);
+ endfatal();
ENDTRY(try35);
}
}
if (idxsize == 0)
{
- beginfatal(&V);
+ beginfatal();
nc_printf("No gates files!\n");
- endfatal(&V);
+ endfatal();
}
index_ = (char(*)[9])Malloc(idxsize * 10L);
indexfile = (uchar *)Malloc(idxsize);
@@ -11635,9 +11635,9 @@ static void initialize()
RECOVER(try38);
if (P_escapecode == -20)
_Escape(P_escapecode);
- beginfatal(&V);
+ beginfatal();
nc_printf("Can't read gates file \"%s\"\n", gatesname[i]);
- endfatal(&V);
+ endfatal();
ENDTRY(try38);
}
if (strcmp(gname[i], s) < 0 && *gname[i] != '\0')
--
GitLab