From ba379b8bd380ea9e523c67a67bf86148ef8a5c39 Mon Sep 17 00:00:00 2001
From: Etienne Brateau <etienne.brateau@ensiie.fr>
Date: Sat, 15 Dec 2018 08:03:15 +0100
Subject: [PATCH] Reduce scope of some static variables
---
log/include/logdef.h | 1 +
log/include/logglobals.h | 3 ---
log/src/gate.c | 2 ++
log/src/log.c | 5 -----
log/src/node.c | 2 ++
5 files changed, 5 insertions(+), 8 deletions(-)
diff --git a/log/include/logdef.h b/log/include/logdef.h
index 39dd6a7..3ab11d4 100644
--- a/log/include/logdef.h
+++ b/log/include/logdef.h
@@ -10,6 +10,7 @@
#else
# define vextern extern
#endif
+
typedef struct log_action_t log_action_t;
#define log_maxpages 9 /* Maximum page number */
#define log_maxpins 255 /* Maximum number of pins on a gate */
diff --git a/log/include/logglobals.h b/log/include/logglobals.h
index eb838f1..9534f29 100644
--- a/log/include/logglobals.h
+++ b/log/include/logglobals.h
@@ -105,9 +105,6 @@ extern short gatecount[log_maxpages]; /* Highest used gate-ID number */
extern char *curfilename[log_maxpages]; /* Name of last-loaded file */
extern long realcurpage;
-extern log_nrec *freenode; /* Node "free" list */
-extern log_grec *freegate; /* Gate "free" list */
-
extern baseptrs copybuf; /* Del/Copy/Paste buffer */
extern long htcount; /* Number of timesteps in list */
diff --git a/log/src/gate.c b/log/src/gate.c
index e75d3d6..25db9b4 100644
--- a/log/src/gate.c
+++ b/log/src/gate.c
@@ -23,6 +23,8 @@
/* new version by Tim Edwards, Dec 1996 */
+static log_grec *freegate = NULL;
+
int insidegate(log_grec *g, short x, short y)
{
short xx1, xx2, yy1, yy2, z;
diff --git a/log/src/log.c b/log/src/log.c
index 2acea3f..e75f6d9 100644
--- a/log/src/log.c
+++ b/log/src/log.c
@@ -237,9 +237,6 @@ short gatecount[log_maxpages]; /* Highest used gate-ID number */
char *curfilename[log_maxpages]; /* Name of last-loaded file */
long realcurpage;
-log_nrec *freenode; /* Node "free" list */
-log_grec *freegate; /* Gate "free" list */
-
baseptrs copybuf; /* Del/Copy/Paste buffer */
long htcount; /* Number of timesteps in list */
@@ -16238,8 +16235,6 @@ static void initialize()
gg.actstr = (char *)Malloc(256);
*gg.actstr = '\0';
gg.maxsignal = defmaxsignal;
- freenode = NULL;
- freegate = NULL;
strlist_init(&histlbl);
l2 = strlist_append(&histlbl, "Scope mode");
l2 = strlist_append(&histlbl, "");
diff --git a/log/src/node.c b/log/src/node.c
index 37ce50c..9260113 100644
--- a/log/src/node.c
+++ b/log/src/node.c
@@ -11,6 +11,8 @@
/*= =*/
/*================================================*/
+static log_nrec *freenode = NULL;
+
void newnptr(log_nrec **n)
{
if (freenode == NULL)
--
GitLab