From c01ab42e872b6bb98c68698eb1c9ac9cbc1c6422 Mon Sep 17 00:00:00 2001 From: Daniel Black Date: Tue, 14 May 2024 15:27:15 +1000 Subject: [PATCH] MCOL-5747 gcc-14.1.1 compile error - calloc - transposed args The arguments of calloc are the number of members and the sizeof the member. Gcc-14.1.1 worked out how to tell the difference. We correct this by transposing to gcc's will. --- writeengine/wrapper/writeengine.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/writeengine/wrapper/writeengine.cpp b/writeengine/wrapper/writeengine.cpp index edf6e0370..c1256ca63 100644 --- a/writeengine/wrapper/writeengine.cpp +++ b/writeengine/wrapper/writeengine.cpp @@ -1099,8 +1099,8 @@ inline void allocateValArray(void*& valArray, ColTupleList::size_type totalRow, case WriteEngine::WR_VARBINARY: // treat same as char for now case WriteEngine::WR_CHAR: case WriteEngine::WR_BLOB: - case WriteEngine::WR_TEXT: valArray = calloc(sizeof(char), totalRow * MAX_COLUMN_BOUNDARY); break; - case WriteEngine::WR_TOKEN: valArray = calloc(sizeof(Token), totalRow); break; + case WriteEngine::WR_TEXT: valArray = calloc(totalRow * MAX_COLUMN_BOUNDARY, sizeof(char)); break; + case WriteEngine::WR_TOKEN: valArray = calloc(totalRow, sizeof(Token)); break; default: valArray = calloc(totalRow, colWidth); break; } }