Skip to content

Commit 4ebac49

Browse files
beutlichbeutlich
committed
Skip null checks for passed external objects
1 parent 7a2a5ed commit 4ebac49

File tree

1 file changed

+42
-28
lines changed

1 file changed

+42
-28
lines changed

‎Modelica/Resources/C-Sources/ModelicaStandardTables.c‎

Lines changed: 42 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -191,6 +191,7 @@
191191
#include "uthash.h"
192192
#include "gconstructor.h"
193193
#endif
194+
#include <assert.h>
194195
#include <float.h>
195196
#include <math.h>
196197
#include <string.h>
@@ -865,9 +866,7 @@ void* ModelicaStandardTables_CombiTimeTable_init3(_In_z_ const char* fileName,
865866

866867
void ModelicaStandardTables_CombiTimeTable_close(void* _tableID) {
867868
CombiTimeTable* tableID = (CombiTimeTable*)_tableID;
868-
if (NULL == tableID) {
869-
return;
870-
}
869+
assert(NULL != tableID);
871870
if (NULL != tableID->table && tableID->source == TABLESOURCE_FILE) {
872871
#if defined(TABLE_SHARE) && !defined(NO_FILE_SYSTEM)
873872
if (NULL != tableID->key) {
@@ -918,7 +917,8 @@ double ModelicaStandardTables_CombiTimeTable_getValue(void* _tableID, int iCol,
918917
double preNextTimeEvent) {
919918
double y = 0.;
920919
CombiTimeTable* tableID = (CombiTimeTable*)_tableID;
921-
if (NULL != tableID && NULL != tableID->table && NULL != tableID->cols &&
920+
assert(NULL != tableID);
921+
if (NULL != tableID->table && NULL != tableID->cols &&
922922
t >= tableID->startTime) {
923923
if (nextTimeEvent < DBL_MAX && nextTimeEvent == preNextTimeEvent &&
924924
tableID->startTime >= nextTimeEvent) {
@@ -1196,7 +1196,8 @@ double ModelicaStandardTables_CombiTimeTable_getDerValue(void* _tableID, int iCo
11961196
double der_t) {
11971197
double der_y = 0.;
11981198
CombiTimeTable* tableID = (CombiTimeTable*)_tableID;
1199-
if (NULL != tableID && NULL != tableID->table && NULL != tableID->cols &&
1199+
assert(NULL != tableID);
1200+
if (NULL != tableID->table && NULL != tableID->cols &&
12001201
t >= tableID->startTime) {
12011202
if (nextTimeEvent < DBL_MAX && nextTimeEvent == preNextTimeEvent &&
12021203
tableID->startTime >= nextTimeEvent) {
@@ -1453,7 +1454,8 @@ double ModelicaStandardTables_CombiTimeTable_getDer2Value(void* _tableID, int iC
14531454
double der2_t) {
14541455
double der2_y = 0.;
14551456
CombiTimeTable* tableID = (CombiTimeTable*)_tableID;
1456-
if (NULL != tableID && NULL != tableID->table && NULL != tableID->cols &&
1457+
assert(NULL != tableID);
1458+
if (NULL != tableID->table && NULL != tableID->cols &&
14571459
t >= tableID->startTime) {
14581460
if (nextTimeEvent < DBL_MAX && nextTimeEvent == preNextTimeEvent &&
14591461
tableID->startTime >= nextTimeEvent) {
@@ -1706,7 +1708,8 @@ double ModelicaStandardTables_CombiTimeTable_getDer2Value(void* _tableID, int iC
17061708
double ModelicaStandardTables_CombiTimeTable_minimumTime(void* _tableID) {
17071709
double tMin = 0.;
17081710
CombiTimeTable* tableID = (CombiTimeTable*)_tableID;
1709-
if (NULL != tableID && NULL != tableID->table) {
1711+
assert(NULL != tableID);
1712+
if (NULL != tableID->table) {
17101713
const double* table = tableID->table;
17111714
tMin = TABLE_ROW0(0);
17121715
}
@@ -1716,7 +1719,8 @@ double ModelicaStandardTables_CombiTimeTable_minimumTime(void* _tableID) {
17161719
double ModelicaStandardTables_CombiTimeTable_maximumTime(void* _tableID) {
17171720
double tMax = 0.;
17181721
CombiTimeTable* tableID = (CombiTimeTable*)_tableID;
1719-
if (NULL != tableID && NULL != tableID->table) {
1722+
assert(NULL != tableID);
1723+
if (NULL != tableID->table) {
17201724
const double* table = tableID->table;
17211725
const size_t nCol = tableID->nCol;
17221726
tMax = TABLE_COL0(tableID->nRow - 1);
@@ -1728,7 +1732,8 @@ double ModelicaStandardTables_CombiTimeTable_nextTimeEvent(void* _tableID,
17281732
double t) {
17291733
double nextTimeEvent = DBL_MAX;
17301734
CombiTimeTable* tableID = (CombiTimeTable*)_tableID;
1731-
if (NULL != tableID && NULL != tableID->table) {
1735+
assert(NULL != tableID);
1736+
if (NULL != tableID->table) {
17321737
const double* table = tableID->table;
17331738
const size_t nRow = tableID->nRow;
17341739
const size_t nCol = tableID->nCol;
@@ -2008,7 +2013,8 @@ double ModelicaStandardTables_CombiTimeTable_read(void* _tableID, int force,
20082013
int verbose) {
20092014
#if !defined(NO_FILE_SYSTEM)
20102015
CombiTimeTable* tableID = (CombiTimeTable*)_tableID;
2011-
if (NULL != tableID && tableID->source == TABLESOURCE_FILE) {
2016+
assert(NULL != tableID);
2017+
if (tableID->source == TABLESOURCE_FILE) {
20122018
if (force || NULL == tableID->table) {
20132019
const char* fileName = tableID->key;
20142020
const char* tableName = tableID->key + strlen(fileName) + 1;
@@ -2312,9 +2318,7 @@ void* ModelicaStandardTables_CombiTable1D_init3(_In_z_ const char* fileName,
23122318

23132319
void ModelicaStandardTables_CombiTable1D_close(void* _tableID) {
23142320
CombiTable1D* tableID = (CombiTable1D*)_tableID;
2315-
if (NULL == tableID) {
2316-
return;
2317-
}
2321+
assert(NULL != tableID);
23182322
if (NULL != tableID->table && tableID->source == TABLESOURCE_FILE) {
23192323
#if defined(TABLE_SHARE) && !defined(NO_FILE_SYSTEM)
23202324
if (NULL != tableID->key) {
@@ -2361,7 +2365,8 @@ double ModelicaStandardTables_CombiTable1D_getValue(void* _tableID, int iCol,
23612365
double u) {
23622366
double y = 0.;
23632367
CombiTable1D* tableID = (CombiTable1D*)_tableID;
2364-
if (NULL != tableID && NULL != tableID->table && NULL != tableID->cols) {
2368+
assert(NULL != tableID);
2369+
if (NULL != tableID->table && NULL != tableID->cols) {
23652370
const double* table = tableID->table;
23662371
const size_t nRow = tableID->nRow;
23672372
const size_t nCol = tableID->nCol;
@@ -2515,7 +2520,8 @@ double ModelicaStandardTables_CombiTable1D_getDerValue(void* _tableID, int iCol,
25152520
double u, double der_u) {
25162521
double der_y = 0.;
25172522
CombiTable1D* tableID = (CombiTable1D*)_tableID;
2518-
if (NULL != tableID && NULL != tableID->table && NULL != tableID->cols) {
2523+
assert(NULL != tableID);
2524+
if (NULL != tableID->table && NULL != tableID->cols) {
25192525
const double* table = tableID->table;
25202526
const size_t nRow = tableID->nRow;
25212527
const size_t nCol = tableID->nCol;
@@ -2657,7 +2663,8 @@ double ModelicaStandardTables_CombiTable1D_getDer2Value(void* _tableID, int iCol
26572663
double der2_u) {
26582664
double der2_y = 0.;
26592665
CombiTable1D* tableID = (CombiTable1D*)_tableID;
2660-
if (NULL != tableID && NULL != tableID->table && NULL != tableID->cols) {
2666+
assert(NULL != tableID);
2667+
if (NULL != tableID->table && NULL != tableID->cols) {
26612668
const double* table = tableID->table;
26622669
const size_t nRow = tableID->nRow;
26632670
const size_t nCol = tableID->nCol;
@@ -2798,7 +2805,8 @@ double ModelicaStandardTables_CombiTable1D_getDer2Value(void* _tableID, int iCol
27982805
double ModelicaStandardTables_CombiTable1D_minimumAbscissa(void* _tableID) {
27992806
double uMin = 0.;
28002807
CombiTable1D* tableID = (CombiTable1D*)_tableID;
2801-
if (NULL != tableID && NULL != tableID->table) {
2808+
assert(NULL != tableID);
2809+
if (NULL != tableID->table) {
28022810
const double* table = tableID->table;
28032811
uMin = TABLE_ROW0(0);
28042812
}
@@ -2808,7 +2816,8 @@ double ModelicaStandardTables_CombiTable1D_minimumAbscissa(void* _tableID) {
28082816
double ModelicaStandardTables_CombiTable1D_maximumAbscissa(void* _tableID) {
28092817
double uMax = 0.;
28102818
CombiTable1D* tableID = (CombiTable1D*)_tableID;
2811-
if (NULL != tableID && NULL != tableID->table) {
2819+
assert(NULL != tableID);
2820+
if (NULL != tableID->table) {
28122821
const double* table = tableID->table;
28132822
const size_t nCol = tableID->nCol;
28142823
uMax = TABLE_COL0(tableID->nRow - 1);
@@ -2820,7 +2829,8 @@ double ModelicaStandardTables_CombiTable1D_read(void* _tableID, int force,
28202829
int verbose) {
28212830
#if !defined(NO_FILE_SYSTEM)
28222831
CombiTable1D* tableID = (CombiTable1D*)_tableID;
2823-
if (NULL != tableID && tableID->source == TABLESOURCE_FILE) {
2832+
assert(NULL != tableID);
2833+
if (tableID->source == TABLESOURCE_FILE) {
28242834
if (force || NULL == tableID->table) {
28252835
const char* fileName = tableID->key;
28262836
const char* tableName = tableID->key + strlen(fileName) + 1;
@@ -3078,9 +3088,7 @@ void* ModelicaStandardTables_CombiTable2D_init3(_In_z_ const char* fileName,
30783088

30793089
void ModelicaStandardTables_CombiTable2D_close(void* _tableID) {
30803090
CombiTable2D* tableID = (CombiTable2D*)_tableID;
3081-
if (NULL == tableID) {
3082-
return;
3083-
}
3091+
assert(NULL != tableID);
30843092
if (NULL != tableID->table && tableID->source == TABLESOURCE_FILE) {
30853093
#if defined(TABLE_SHARE) && !defined(NO_FILE_SYSTEM)
30863094
if (NULL != tableID->key) {
@@ -3124,7 +3132,8 @@ double ModelicaStandardTables_CombiTable2D_getValue(void* _tableID, double u1,
31243132
double u2) {
31253133
double y = 0;
31263134
CombiTable2D* tableID = (CombiTable2D*)_tableID;
3127-
if (NULL != tableID && NULL != tableID->table) {
3135+
assert(NULL != tableID);
3136+
if (NULL != tableID->table) {
31283137
const double* table = tableID->table;
31293138
const size_t nRow = tableID->nRow;
31303139
const size_t nCol = tableID->nCol;
@@ -4226,7 +4235,8 @@ double ModelicaStandardTables_CombiTable2D_getDerValue(void* _tableID, double u1
42264235
double der_u2) {
42274236
double der_y = 0;
42284237
CombiTable2D* tableID = (CombiTable2D*)_tableID;
4229-
if (NULL != tableID && NULL != tableID->table) {
4238+
assert(NULL != tableID);
4239+
if (NULL != tableID->table) {
42304240
const double* table = tableID->table;
42314241
const size_t nRow = tableID->nRow;
42324242
const size_t nCol = tableID->nCol;
@@ -5147,7 +5157,8 @@ double ModelicaStandardTables_CombiTable2D_getDer2Value(void* _tableID, double u
51475157
double der2_u2) {
51485158
double der2_y = 0;
51495159
CombiTable2D* tableID = (CombiTable2D*)_tableID;
5150-
if (NULL != tableID && NULL != tableID->table) {
5160+
assert(NULL != tableID);
5161+
if (NULL != tableID->table) {
51515162
const double* table = tableID->table;
51525163
const size_t nRow = tableID->nRow;
51535164
const size_t nCol = tableID->nCol;
@@ -6094,7 +6105,8 @@ double ModelicaStandardTables_CombiTable2D_getDer2Value(void* _tableID, double u
60946105
void ModelicaStandardTables_CombiTable2D_minimumAbscissa(void* _tableID,
60956106
_Inout_ double* uMin) {
60966107
CombiTable2D* tableID = (CombiTable2D*)_tableID;
6097-
if (NULL != tableID && NULL != tableID->table) {
6108+
assert(NULL != tableID);
6109+
if (NULL != tableID->table) {
60986110
const double* table = tableID->table;
60996111
const size_t nCol = tableID->nCol;
61006112
uMin[0] = TABLE_COL0(1);
@@ -6109,7 +6121,8 @@ void ModelicaStandardTables_CombiTable2D_minimumAbscissa(void* _tableID,
61096121
void ModelicaStandardTables_CombiTable2D_maximumAbscissa(void* _tableID,
61106122
_Inout_ double* uMax) {
61116123
CombiTable2D* tableID = (CombiTable2D*)_tableID;
6112-
if (NULL != tableID && NULL != tableID->table) {
6124+
assert(NULL != tableID);
6125+
if (NULL != tableID->table) {
61136126
const double* table = tableID->table;
61146127
const size_t nRow = tableID->nRow;
61156128
const size_t nCol = tableID->nCol;
@@ -6126,7 +6139,8 @@ double ModelicaStandardTables_CombiTable2D_read(void* _tableID, int force,
61266139
int verbose) {
61276140
#if !defined(NO_FILE_SYSTEM)
61286141
CombiTable2D* tableID = (CombiTable2D*)_tableID;
6129-
if (NULL != tableID && tableID->source == TABLESOURCE_FILE) {
6142+
assert(NULL != tableID);
6143+
if (tableID->source == TABLESOURCE_FILE) {
61306144
if (force || NULL == tableID->table) {
61316145
const char* fileName = tableID->key;
61326146
const char* tableName = tableID->key + strlen(fileName) + 1;

0 commit comments

Comments
 (0)