Convert public char* to const char* for C++ compatibility.

This commit is contained in:
John McNamara 2023-09-24 20:40:07 +01:00
parent e94bbb54eb
commit 5625238848
43 changed files with 171 additions and 161 deletions

View file

@ -106,7 +106,7 @@ int main() {
worksheet_autofilter(worksheet, 0, 0, 50, 3);
char* list[] = {"East", "North", "South", NULL};
const char* list[] = {"East", "North", "South", NULL};
worksheet_filter_list(worksheet, 0, list);

View file

@ -107,7 +107,7 @@ int main() {
worksheet_autofilter(worksheet, 0, 0, 50, 3);
char* list[] = {"East", "North", "South", "Blanks", NULL};
const char* list[] = {"East", "North", "South", "Blanks", NULL};
worksheet_filter_list(worksheet, 0, list);

View file

@ -108,7 +108,7 @@ int main() {
worksheet_autofilter(worksheet, 0, 0, 50, 3);
char* list[] = {"3000", "5000", "8000", NULL};
const char* list[] = {"3000", "5000", "8000", NULL};
worksheet_filter_list(worksheet, 2, list);

View file

@ -13,7 +13,7 @@ int main() {
lxw_workbook *workbook = workbook_new("test_data_validation01.xlsx");
lxw_worksheet *worksheet = workbook_add_worksheet(workbook, NULL);
char *list[] = {"Foo", "Bar", "Baz", NULL};
const char* list[] = {"Foo", "Bar", "Baz", NULL};
lxw_data_validation *data_validation = calloc(1, sizeof(lxw_data_validation));
data_validation->validate = LXW_VALIDATION_TYPE_LIST;

View file

@ -13,7 +13,7 @@ int main() {
lxw_workbook *workbook = workbook_new("test_data_validation02.xlsx");
lxw_worksheet *worksheet = workbook_add_worksheet(workbook, NULL);
char *list[] = {"Foo", "Bar", "Baz", NULL};
const char* list[] = {"Foo", "Bar", "Baz", NULL};
lxw_data_validation *data_validation = calloc(1, sizeof(lxw_data_validation));
data_validation->validate = LXW_VALIDATION_TYPE_LIST;

View file

@ -13,8 +13,8 @@ int main() {
lxw_workbook *workbook = workbook_new("test_data_validation03.xlsx");
lxw_worksheet *worksheet = workbook_add_worksheet(workbook, NULL);
char *list1[] = {"Foo", "Bar", "Baz", NULL};
char *list2[] = {
const char *list1[] = {"Foo", "Bar", "Baz", NULL};
const char *list2[] = {
"Foobar", "Foobas", "Foobat", "Foobau", "Foobav", "Foobaw", "Foobax",
"Foobay", "Foobaz", "Foobba", "Foobbb", "Foobbc", "Foobbd", "Foobbe",
"Foobbf", "Foobbg", "Foobbh", "Foobbi", "Foobbj", "Foobbk", "Foobbl",

View file

@ -13,8 +13,8 @@ int main() {
lxw_workbook *workbook = workbook_new("test_data_validation04.xlsx");
lxw_worksheet *worksheet = workbook_add_worksheet(workbook, NULL);
char *list1[] = {"Foo", "Bar", "Baz", NULL};
char *list2[] = {
const char *list1[] = {"Foo", "Bar", "Baz", NULL};
const char *list2[] = {
"Foobar", "Foobas", "Foobat", "Foobau", "Foobav", "Foobaw", "Foobax",
"Foobay", "Foobaz", "Foobba", "Foobbb", "Foobbc", "Foobbd", "Foobbe",
"Foobbf", "Foobbg", "Foobbh", "Foobbi", "Foobbj", "Foobbk", "Foobbl",

View file

@ -13,8 +13,8 @@ int main() {
lxw_workbook *workbook = workbook_new("test_data_validation05.xlsx");
lxw_worksheet *worksheet = workbook_add_worksheet(workbook, NULL);
char *list1[] = {"Foo", "Bar", "Baz", NULL};
char *list2[] = {
const char *list1[] = {"Foo", "Bar", "Baz", NULL};
const char *list2[] = {
"Foobar", "Foobas", "Foobat", "Foobau", "Foobav", "Foobaw", "Foobax",
"Foobay", "Foobaz", "Foobba", "Foobbb", "Foobbc", "Foobbd", "Foobbe",
"Foobbf", "Foobbg", "Foobbh", "Foobbi", "Foobbj", "Foobbk", "Foobbl",

View file

@ -13,8 +13,8 @@ int main() {
lxw_workbook *workbook = workbook_new("test_data_validation06.xlsx");
lxw_worksheet *worksheet = workbook_add_worksheet(workbook, NULL);
char *list1[] = {"Foo", "Bar", "Baz", NULL};
char *list2[] = {
const char *list1[] = {"Foo", "Bar", "Baz", NULL};
const char *list2[] = {
"Foobar", "Foobas", "Foobat", "Foobau", "Foobav", "Foobaw", "Foobax",
"Foobay", "Foobaz", "Foobba", "Foobbb", "Foobbc", "Foobbd", "Foobbe",
"Foobbf", "Foobbg", "Foobbh", "Foobbi", "Foobbj", "Foobbk", "Foobbl",

View file

@ -13,7 +13,7 @@ int main() {
lxw_workbook *workbook = workbook_new("test_data_validation07.xlsx");
lxw_worksheet *worksheet = workbook_add_worksheet(workbook, NULL);
char *list[] = {"coffee", "café", NULL};
const char* list[] = {"coffee", "café", NULL};
lxw_data_validation *data_validation = calloc(1, sizeof(lxw_data_validation));
data_validation->validate = LXW_VALIDATION_TYPE_LIST;

View file

@ -10,7 +10,7 @@
#include "xlsxwriter.h"
int main() {
char *output_buffer;
const char *output_buffer;
size_t output_buffer_size;
lxw_workbook_options options = {LXW_FALSE,
".",
@ -31,7 +31,7 @@ int main() {
FILE *file = fopen("test_output_buffer01.xlsx", "wb");
fwrite(output_buffer, output_buffer_size, 1, file);
fclose(file);
free(output_buffer);
free((void *)output_buffer);
return 0;
}

View file

@ -33,15 +33,15 @@ int main() {
worksheet_set_column(worksheet, 0, 0, 70, NULL);
worksheet_write_string(worksheet, CELL("A1"), "Select 'Office Button -> Prepare -> Properties' to see the file properties." , NULL);
free(properties->title);
free(properties->subject);
free(properties->author);
free(properties->manager);
free(properties->company);
free(properties->category);
free(properties->keywords);
free(properties->comments);
free(properties->status);
free((void *)properties->title);
free((void *)properties->subject);
free((void *)properties->author);
free((void *)properties->manager);
free((void *)properties->company);
free((void *)properties->category);
free((void *)properties->keywords);
free((void *)properties->comments);
free((void *)properties->status);
free(properties);
return workbook_close(workbook);

View file

@ -21,7 +21,7 @@ int main() {
(void)worksheet;
free(properties->hyperlink_base);
free((void *)properties->hyperlink_base);
free(properties);
return workbook_close(workbook);

View file

@ -458,7 +458,7 @@ CTEST(worksheet, write_write_auto_filter19) {
worksheet_autofilter(worksheet, 0, 0, 50, 3);
char* list[] = {"East", NULL};
const char* list[] = {"East", NULL};
worksheet_filter_list(worksheet, 0, list);
@ -481,7 +481,7 @@ CTEST(worksheet, write_write_auto_filter20) {
worksheet_autofilter(worksheet, 0, 0, 50, 3);
char* list[] = {"East", "North", NULL};
const char* list[] = {"East", "North", NULL};
worksheet_filter_list(worksheet, 0, list);
@ -504,7 +504,7 @@ CTEST(worksheet, write_write_auto_filter21) {
worksheet_autofilter(worksheet, 0, 0, 50, 3);
char* list[] = {"February", "January", "July", "June", NULL};
const char* list[] = {"February", "January", "July", "June", NULL};
worksheet_filter_list(worksheet, 3, list);

View file

@ -128,7 +128,7 @@ CTEST(worksheet, write_data_validations04) {
char* got;
char exp[] = "<dataValidations count=\"1\"><dataValidation type=\"list\" allowBlank=\"1\" showInputMessage=\"1\" showErrorMessage=\"1\" sqref=\"A4\"><formula1>\"open,high,close\"</formula1></dataValidation></dataValidations>";
FILE* testfile = lxw_tmpfile(NULL);
char *list[] = {"open", "high", "close", NULL};
const char* list[] = {"open", "high", "close", NULL};
lxw_data_validation *data_validation = calloc(1, sizeof(lxw_data_validation));
data_validation->validate = LXW_VALIDATION_TYPE_LIST;

View file

@ -486,7 +486,7 @@ CTEST(worksheet, test_write_data_validations_220) {
char* got;
char exp[] = "<dataValidations count=\"1\"><dataValidation type=\"list\" allowBlank=\"1\" showInputMessage=\"1\" showErrorMessage=\"1\" sqref=\"B5\"><formula1>\"a,bb,ccc\"</formula1></dataValidation></dataValidations>";
FILE* testfile = lxw_tmpfile(NULL);
char *list[] = {"a", "bb", "ccc", NULL};
const char* list[] = {"a", "bb", "ccc", NULL};
lxw_data_validation *data_validation = calloc(1, sizeof(lxw_data_validation));
data_validation->validate = LXW_VALIDATION_TYPE_LIST;
@ -509,7 +509,7 @@ CTEST(worksheet, test_write_data_validations_221) {
char* got;
char exp[] = "<dataValidations count=\"1\"><dataValidation type=\"list\" allowBlank=\"1\" showDropDown=\"1\" showInputMessage=\"1\" showErrorMessage=\"1\" sqref=\"B5\"><formula1>\"a,bb,ccc\"</formula1></dataValidation></dataValidations>";
FILE* testfile = lxw_tmpfile(NULL);
char *list[] = {"a", "bb", "ccc", NULL};
const char* list[] = {"a", "bb", "ccc", NULL};
lxw_data_validation *data_validation = calloc(1, sizeof(lxw_data_validation));
data_validation->validate = LXW_VALIDATION_TYPE_LIST;