Skip to content

Skip NULL checks for passed external objects #4406

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
casella merged 1 commit into from
Jun 22, 2024
Merged

Skip NULL checks for passed external objects #4406

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
70 changes: 42 additions & 28 deletions Modelica/Resources/C-Sources/ModelicaStandardTables.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -196,6 +196,7 @@
#include "uthash.h"
#include "gconstructor.h"
#endif
#include <assert.h>
#include <float.h>
#include <math.h>
#include <string.h>
Expand Down Expand Up @@ -870,9 +871,7 @@ void* ModelicaStandardTables_CombiTimeTable_init3(_In_z_ const char* fileName,

void ModelicaStandardTables_CombiTimeTable_close(void* _tableID) {
CombiTimeTable* tableID = (CombiTimeTable*)_tableID;
if (NULL == tableID) {
return;
}
assert(NULL != tableID);
if (NULL != tableID->table && tableID->source == TABLESOURCE_FILE) {
#if defined(TABLE_SHARE) && !defined(NO_FILE_SYSTEM)
if (NULL != tableID->key) {
Expand Down Expand Up @@ -923,7 +922,8 @@ double ModelicaStandardTables_CombiTimeTable_getValue(void* _tableID, int iCol,
double preNextTimeEvent) {
double y = 0.;
CombiTimeTable* tableID = (CombiTimeTable*)_tableID;
if (NULL != tableID && NULL != tableID->table && NULL != tableID->cols &&
assert(NULL != tableID);
if (NULL != tableID->table && NULL != tableID->cols &&
t >= tableID->startTime) {
if (nextTimeEvent < DBL_MAX && nextTimeEvent == preNextTimeEvent &&
tableID->startTime >= nextTimeEvent) {
Expand Down Expand Up @@ -1201,7 +1201,8 @@ double ModelicaStandardTables_CombiTimeTable_getDerValue(void* _tableID, int iCo
double der_t) {
double der_y = 0.;
CombiTimeTable* tableID = (CombiTimeTable*)_tableID;
if (NULL != tableID && NULL != tableID->table && NULL != tableID->cols &&
assert(NULL != tableID);
if (NULL != tableID->table && NULL != tableID->cols &&
t >= tableID->startTime) {
if (nextTimeEvent < DBL_MAX && nextTimeEvent == preNextTimeEvent &&
tableID->startTime >= nextTimeEvent) {
Expand Down Expand Up @@ -1458,7 +1459,8 @@ double ModelicaStandardTables_CombiTimeTable_getDer2Value(void* _tableID, int iC
double der2_t) {
double der2_y = 0.;
CombiTimeTable* tableID = (CombiTimeTable*)_tableID;
if (NULL != tableID && NULL != tableID->table && NULL != tableID->cols &&
assert(NULL != tableID);
if (NULL != tableID->table && NULL != tableID->cols &&
t >= tableID->startTime) {
if (nextTimeEvent < DBL_MAX && nextTimeEvent == preNextTimeEvent &&
tableID->startTime >= nextTimeEvent) {
Expand Down Expand Up @@ -1711,7 +1713,8 @@ double ModelicaStandardTables_CombiTimeTable_getDer2Value(void* _tableID, int iC
double ModelicaStandardTables_CombiTimeTable_minimumTime(void* _tableID) {
double tMin = 0.;
CombiTimeTable* tableID = (CombiTimeTable*)_tableID;
if (NULL != tableID && NULL != tableID->table) {
assert(NULL != tableID);
if (NULL != tableID->table) {
const double* table = tableID->table;
tMin = TABLE_ROW0(0);
}
Expand All @@ -1721,7 +1724,8 @@ double ModelicaStandardTables_CombiTimeTable_minimumTime(void* _tableID) {
double ModelicaStandardTables_CombiTimeTable_maximumTime(void* _tableID) {
double tMax = 0.;
CombiTimeTable* tableID = (CombiTimeTable*)_tableID;
if (NULL != tableID && NULL != tableID->table) {
assert(NULL != tableID);
if (NULL != tableID->table) {
const double* table = tableID->table;
const size_t nCol = tableID->nCol;
tMax = TABLE_COL0(tableID->nRow - 1);
Expand All @@ -1733,7 +1737,8 @@ double ModelicaStandardTables_CombiTimeTable_nextTimeEvent(void* _tableID,
double t) {
double nextTimeEvent = DBL_MAX;
CombiTimeTable* tableID = (CombiTimeTable*)_tableID;
if (NULL != tableID && NULL != tableID->table) {
assert(NULL != tableID);
if (NULL != tableID->table) {
const double* table = tableID->table;
const size_t nRow = tableID->nRow;
const size_t nCol = tableID->nCol;
Expand Down Expand Up @@ -2013,7 +2018,8 @@ double ModelicaStandardTables_CombiTimeTable_read(void* _tableID, int force,
int verbose) {
#if !defined(NO_FILE_SYSTEM)
CombiTimeTable* tableID = (CombiTimeTable*)_tableID;
if (NULL != tableID && tableID->source == TABLESOURCE_FILE) {
assert(NULL != tableID);
if (tableID->source == TABLESOURCE_FILE) {
if (force || NULL == tableID->table) {
const char* fileName = tableID->key;
const char* tableName = tableID->key + strlen(fileName) + 1;
Expand Down Expand Up @@ -2317,9 +2323,7 @@ void* ModelicaStandardTables_CombiTable1D_init3(_In_z_ const char* fileName,

void ModelicaStandardTables_CombiTable1D_close(void* _tableID) {
CombiTable1D* tableID = (CombiTable1D*)_tableID;
if (NULL == tableID) {
return;
}
assert(NULL != tableID);
if (NULL != tableID->table && tableID->source == TABLESOURCE_FILE) {
#if defined(TABLE_SHARE) && !defined(NO_FILE_SYSTEM)
if (NULL != tableID->key) {
Expand Down Expand Up @@ -2366,7 +2370,8 @@ double ModelicaStandardTables_CombiTable1D_getValue(void* _tableID, int iCol,
double u) {
double y = 0.;
CombiTable1D* tableID = (CombiTable1D*)_tableID;
if (NULL != tableID && NULL != tableID->table && NULL != tableID->cols) {
assert(NULL != tableID);
if (NULL != tableID->table && NULL != tableID->cols) {
const double* table = tableID->table;
const size_t nRow = tableID->nRow;
const size_t nCol = tableID->nCol;
Expand Down Expand Up @@ -2520,7 +2525,8 @@ double ModelicaStandardTables_CombiTable1D_getDerValue(void* _tableID, int iCol,
double u, double der_u) {
double der_y = 0.;
CombiTable1D* tableID = (CombiTable1D*)_tableID;
if (NULL != tableID && NULL != tableID->table && NULL != tableID->cols) {
assert(NULL != tableID);
if (NULL != tableID->table && NULL != tableID->cols) {
const double* table = tableID->table;
const size_t nRow = tableID->nRow;
const size_t nCol = tableID->nCol;
Expand Down Expand Up @@ -2662,7 +2668,8 @@ double ModelicaStandardTables_CombiTable1D_getDer2Value(void* _tableID, int iCol
double der2_u) {
double der2_y = 0.;
CombiTable1D* tableID = (CombiTable1D*)_tableID;
if (NULL != tableID && NULL != tableID->table && NULL != tableID->cols) {
assert(NULL != tableID);
if (NULL != tableID->table && NULL != tableID->cols) {
const double* table = tableID->table;
const size_t nRow = tableID->nRow;
const size_t nCol = tableID->nCol;
Expand Down Expand Up @@ -2803,7 +2810,8 @@ double ModelicaStandardTables_CombiTable1D_getDer2Value(void* _tableID, int iCol
double ModelicaStandardTables_CombiTable1D_minimumAbscissa(void* _tableID) {
double uMin = 0.;
CombiTable1D* tableID = (CombiTable1D*)_tableID;
if (NULL != tableID && NULL != tableID->table) {
assert(NULL != tableID);
if (NULL != tableID->table) {
const double* table = tableID->table;
uMin = TABLE_ROW0(0);
}
Expand All @@ -2813,7 +2821,8 @@ double ModelicaStandardTables_CombiTable1D_minimumAbscissa(void* _tableID) {
double ModelicaStandardTables_CombiTable1D_maximumAbscissa(void* _tableID) {
double uMax = 0.;
CombiTable1D* tableID = (CombiTable1D*)_tableID;
if (NULL != tableID && NULL != tableID->table) {
assert(NULL != tableID);
if (NULL != tableID->table) {
const double* table = tableID->table;
const size_t nCol = tableID->nCol;
uMax = TABLE_COL0(tableID->nRow - 1);
Expand All @@ -2825,7 +2834,8 @@ double ModelicaStandardTables_CombiTable1D_read(void* _tableID, int force,
int verbose) {
#if !defined(NO_FILE_SYSTEM)
CombiTable1D* tableID = (CombiTable1D*)_tableID;
if (NULL != tableID && tableID->source == TABLESOURCE_FILE) {
assert(NULL != tableID);
if (tableID->source == TABLESOURCE_FILE) {
if (force || NULL == tableID->table) {
const char* fileName = tableID->key;
const char* tableName = tableID->key + strlen(fileName) + 1;
Expand Down Expand Up @@ -3083,9 +3093,7 @@ void* ModelicaStandardTables_CombiTable2D_init3(_In_z_ const char* fileName,

void ModelicaStandardTables_CombiTable2D_close(void* _tableID) {
CombiTable2D* tableID = (CombiTable2D*)_tableID;
if (NULL == tableID) {
return;
}
assert(NULL != tableID);
if (NULL != tableID->table && tableID->source == TABLESOURCE_FILE) {
#if defined(TABLE_SHARE) && !defined(NO_FILE_SYSTEM)
if (NULL != tableID->key) {
Expand Down Expand Up @@ -3129,7 +3137,8 @@ double ModelicaStandardTables_CombiTable2D_getValue(void* _tableID, double u1,
double u2) {
double y = 0;
CombiTable2D* tableID = (CombiTable2D*)_tableID;
if (NULL != tableID && NULL != tableID->table) {
assert(NULL != tableID);
if (NULL != tableID->table) {
const double* table = tableID->table;
const size_t nRow = tableID->nRow;
const size_t nCol = tableID->nCol;
Expand Down Expand Up @@ -4231,7 +4240,8 @@ double ModelicaStandardTables_CombiTable2D_getDerValue(void* _tableID, double u1
double der_u2) {
double der_y = 0;
CombiTable2D* tableID = (CombiTable2D*)_tableID;
if (NULL != tableID && NULL != tableID->table) {
assert(NULL != tableID);
if (NULL != tableID->table) {
const double* table = tableID->table;
const size_t nRow = tableID->nRow;
const size_t nCol = tableID->nCol;
Expand Down Expand Up @@ -5146,7 +5156,8 @@ double ModelicaStandardTables_CombiTable2D_getDer2Value(void* _tableID, double u
double der2_u2) {
double der2_y = 0;
CombiTable2D* tableID = (CombiTable2D*)_tableID;
if (NULL != tableID && NULL != tableID->table) {
assert(NULL != tableID);
if (NULL != tableID->table) {
const double* table = tableID->table;
const size_t nRow = tableID->nRow;
const size_t nCol = tableID->nCol;
Expand Down Expand Up @@ -6087,7 +6098,8 @@ double ModelicaStandardTables_CombiTable2D_getDer2Value(void* _tableID, double u
void ModelicaStandardTables_CombiTable2D_minimumAbscissa(void* _tableID,
_Inout_ double* uMin) {
CombiTable2D* tableID = (CombiTable2D*)_tableID;
if (NULL != tableID && NULL != tableID->table) {
assert(NULL != tableID);
if (NULL != tableID->table) {
const double* table = tableID->table;
const size_t nCol = tableID->nCol;
uMin[0] = TABLE_COL0(1);
Expand All @@ -6102,7 +6114,8 @@ void ModelicaStandardTables_CombiTable2D_minimumAbscissa(void* _tableID,
void ModelicaStandardTables_CombiTable2D_maximumAbscissa(void* _tableID,
_Inout_ double* uMax) {
CombiTable2D* tableID = (CombiTable2D*)_tableID;
if (NULL != tableID && NULL != tableID->table) {
assert(NULL != tableID);
if (NULL != tableID->table) {
const double* table = tableID->table;
const size_t nRow = tableID->nRow;
const size_t nCol = tableID->nCol;
Expand All @@ -6119,7 +6132,8 @@ double ModelicaStandardTables_CombiTable2D_read(void* _tableID, int force,
int verbose) {
#if !defined(NO_FILE_SYSTEM)
CombiTable2D* tableID = (CombiTable2D*)_tableID;
if (NULL != tableID && tableID->source == TABLESOURCE_FILE) {
assert(NULL != tableID);
if (tableID->source == TABLESOURCE_FILE) {
if (force || NULL == tableID->table) {
const char* fileName = tableID->key;
const char* tableName = tableID->key + strlen(fileName) + 1;
Expand Down