Skip to content

Commit

Permalink
refs #2220, #2192: Fix argument order in ModelicaIO.c
Browse files Browse the repository at this point in the history
  • Loading branch information
beutlich committed Mar 27, 2017
1 parent 0964f1a commit 65547e6
Showing 1 changed file with 4 additions and 4 deletions.
8 changes: 4 additions & 4 deletions Modelica/Resources/C-Sources/ModelicaIO.c
Original file line number Diff line number Diff line change
Expand Up @@ -145,7 +145,7 @@ typedef struct MatIO {
matvar_t* matvarRoot; /* Pointer to MAT-file variable for free */
} MatIO;

static double* readMatTable(_In_z_ const char* tableName, _In_z_ const char* fileName,
static double* readMatTable(_In_z_ const char* fileName, _In_z_ const char* tableName,
_Out_ size_t* m, _Out_ size_t* n) MODELICA_NONNULLATTR;
/* Read a table from a MATLAB MAT-file using MatIO functions
Expand All @@ -155,7 +155,7 @@ static double* readMatTable(_In_z_ const char* tableName, _In_z_ const char* fil
static void readMatIO(_In_z_ const char* fileName, _In_z_ const char* matrixName, _Inout_ MatIO* matio);
/* Read a variable from a MATLAB MAT-file using MatIO functions */

static double* readTxtTable(_In_z_ const char* tableName, _In_z_ const char* fileName,
static double* readTxtTable(_In_z_ const char* fileName, _In_z_ const char* tableName,
_Out_ size_t* m, _Out_ size_t* n) MODELICA_NONNULLATTR;
/* Read a table from an ASCII text file
Expand Down Expand Up @@ -365,7 +365,7 @@ MODELICA_EXPORT double* ModelicaIO_readRealTable(_In_z_ const char* fileName,
return table;
}

static double* readMatTable(_In_z_ const char* tableName, _In_z_ const char* fileName,
static double* readMatTable(_In_z_ const char* fileName, _In_z_ const char* tableName,
_Out_ size_t* m, _Out_ size_t* n) {
double* table = NULL;
MatIO matio = {NULL, NULL, NULL};
Expand Down Expand Up @@ -582,7 +582,7 @@ static int IsNumber(char* token) {
return isNumber;
}

static double* readTxtTable(_In_z_ const char* tableName, _In_z_ const char* fileName,
static double* readTxtTable(_In_z_ const char* fileName, _In_z_ const char* tableName,
_Out_ size_t* m, _Out_ size_t* n) {
#define DELIM_TABLE_HEADER " \t(,)\r"
#define DELIM_TABLE_NUMBER " \t,;\r"
Expand Down

0 comments on commit 65547e6

Please sign in to comment.