From 051faadc0b7f7409fc371fbd3f6ddd1f4319cd25 Mon Sep 17 00:00:00 2001 From: Henrik Tidefelt Date: Thu, 23 Nov 2023 08:43:28 +0100 Subject: [PATCH 1/2] Delete trailing spaces --- ModelicaCompliance/Resources/Include/ExtObj.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/ModelicaCompliance/Resources/Include/ExtObj.c b/ModelicaCompliance/Resources/Include/ExtObj.c index 8213a76..d4a449a 100644 --- a/ModelicaCompliance/Resources/Include/ExtObj.c +++ b/ModelicaCompliance/Resources/Include/ExtObj.c @@ -25,7 +25,7 @@ void* initMyTable(double *table_data, size_t table_size) free(table); ModelicaError("Error allocating array in MyTable.\n"); return 0; /* Not reachable */ - } + } memcpy(table->array, table_data, table_size * sizeof(double)); table->size = table_size; @@ -40,7 +40,7 @@ void closeMyTable(void *object) if (object == NULL) return; free(table->array); free(table); -} +} /* Interpolates between two adjacent values in the table. */ double interpolateMyTable(void *object, double u) From 7f2c165341e408591bc749dd80be4c4e08410373 Mon Sep 17 00:00:00 2001 From: Henrik Tidefelt Date: Thu, 23 Nov 2023 09:08:26 +0100 Subject: [PATCH 2/2] Make function definitions used through Include annotations static This makes the external functions compatible with generation of one compilation unit for each external function. --- ModelicaCompliance/Resources/Include/ExtObj.c | 3 +++ ModelicaCompliance/Resources/Include/ExtObj.h | 6 +++--- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/ModelicaCompliance/Resources/Include/ExtObj.c b/ModelicaCompliance/Resources/Include/ExtObj.c index d4a449a..60daaac 100644 --- a/ModelicaCompliance/Resources/Include/ExtObj.c +++ b/ModelicaCompliance/Resources/Include/ExtObj.c @@ -10,6 +10,7 @@ #include "ExtObj.h" /* Constructor for MyTable. */ +static void* initMyTable(double *table_data, size_t table_size) { MyTable *table = (MyTable*)malloc(sizeof(MyTable)); @@ -34,6 +35,7 @@ void* initMyTable(double *table_data, size_t table_size) } /* Destructor for MyTable. */ +static void closeMyTable(void *object) { MyTable *table = (MyTable*)object; @@ -43,6 +45,7 @@ void closeMyTable(void *object) } /* Interpolates between two adjacent values in the table. */ +static double interpolateMyTable(void *object, double u) { MyTable *table = (MyTable*)object; diff --git a/ModelicaCompliance/Resources/Include/ExtObj.h b/ModelicaCompliance/Resources/Include/ExtObj.h index b8df772..e35729b 100644 --- a/ModelicaCompliance/Resources/Include/ExtObj.h +++ b/ModelicaCompliance/Resources/Include/ExtObj.h @@ -6,8 +6,8 @@ typedef struct { unsigned size; } MyTable; -void* initMyTable(double *table_data, size_t table_size); -void closeMyTable(void* object); -double interpolateMyTable(void* object, double u); +static void* initMyTable(double *table_data, size_t table_size); +static void closeMyTable(void* object); +static double interpolateMyTable(void* object, double u); #endif /*EXTOBJ_H*/