From 45f5d6259446a81aa3885640295dddf9f59173f1 Mon Sep 17 00:00:00 2001
From: Etienne Brateau <etienne.brateau@ensiie.fr>
Date: Wed, 20 Feb 2019 22:16:48 +0100
Subject: [PATCH] Clean more things
---
include/logdig.h | 6 +++---
include/utils/p2c.h | 2 --
src/log.c | 2 +-
src/logsim.c | 1 +
4 files changed, 5 insertions(+), 6 deletions(-)
diff --git a/include/logdig.h b/include/logdig.h
index 825f8b6..595a453 100644
--- a/include/logdig.h
+++ b/include/logdig.h
@@ -43,9 +43,9 @@ typedef struct log_16_action {
void (*hook_input) (log_action_t *lact, log_nrec *n, log_16_value *v);
void (*hook_output) (log_action_t *lact, log_nrec *n, log_16_value v);
void (*hook_ocoutput) (log_action_t *lact, log_nrec *n, log_16_value v);
- void (*hook_led) (log_action_t *lact, int x, int y, log_16_value v);
- void (*hook_eraled) (log_action_t *lact, int x, int y);
- void (*hook_plotled) (log_action_t *lact, int x, int y, log_16_value v);
+ void (*hook_led) (log_action_t *lact, short x, short y, log_16_value v);
+ void (*hook_eraled) (log_action_t *lact, short x, short y);
+ void (*hook_plotled) (log_action_t *lact, short x, short y, log_16_value v);
} log_16_action;
vextern const log_16_viarr log_16_vi;
diff --git a/include/utils/p2c.h b/include/utils/p2c.h
index 8d9e80a..671b8a2 100644
--- a/include/utils/p2c.h
+++ b/include/utils/p2c.h
@@ -76,8 +76,6 @@ typedef struct {
void PASCAL_MAIN (int, char **);
-char **P_argv;
-int P_argc;
short P_escapecode;
int P_ioresult;
__p2c_jmp_buf *__top_jb;
diff --git a/src/log.c b/src/log.c
index 6373adb..b85fc96 100644
--- a/src/log.c
+++ b/src/log.c
@@ -5245,7 +5245,7 @@ static void gatedefinitioncommand()
static librstrrec *findlibrstr(char *name_)
{
size_t name_length = strlen(name_);
- char *name = malloc(sizeof(char) * name_length);
+ char *name = (char*) malloc(sizeof(char) * name_length);
librstrrec *lsp = librstrs;
strreverse(name, name_);
diff --git a/src/logsim.c b/src/logsim.c
index 2b3a73b..82d54b1 100644
--- a/src/logsim.c
+++ b/src/logsim.c
@@ -43,6 +43,7 @@
#include "logsim.h"
#include "node.h"
#include "tool.h"
+#include "logstuff.h"
/*$ if debugging $
$ debug on $
--
GitLab