c/libxlsxwriter
1
0
Fork 0
mirror of https://github.com/jmcnamara/libxlsxwriter synced 2025-03-28 21:13:14 +00:00
Code Issues Packages Projects Releases Wiki Activity

Refactored internal error macros to avoid name conflicts.

Browse Source
This commit is contained in:
John McNamara 2015-11-07 23:59:13 +00:00
parent d2fd0fc4f8
commit ad96d932ac
4 changed files with 12 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
include/xlsxwriter/common.h
View File

@ -28,21 +28,21 @@ enum lxw_boolean {
#define LXW_IGNORE 1
#define ERROR(message) \
#define LXW_ERROR(message) \
fprintf(stderr, "[ERROR][%s:%d]: " message "\n", __FILE__, __LINE__)
#define MEM_ERROR() \
ERROR("Memory allocation failed.")
#define LXW_MEM_ERROR() \
LXW_ERROR("Memory allocation failed.")
#define GOTO_LABEL_ON_MEM_ERROR(pointer, label) \
if (!pointer) { \
MEM_ERROR(); \
LXW_MEM_ERROR(); \
goto label; \
}
#define RETURN_ON_MEM_ERROR(pointer, error) \
if (!pointer) { \
MEM_ERROR(); \
LXW_MEM_ERROR(); \
return error; \
}

10
src/packager.c
View File

@ -59,7 +59,7 @@ _new_packager(const char *filename)
/* Create a zip container for the xlsx file. */
packager->zipfile = zipOpen(packager->filename, 0);
if (packager->zipfile == NULL) {
ERROR("Error opening zip file for xlsx");
LXW_ERROR("Error opening zip file for xlsx");
goto mem_error;
}
@ -457,7 +457,7 @@ _add_file_to_zip(lxw_packager *self, FILE * file, const char *filename)
Z_DEFAULT_STRATEGY, NULL, 0, 0, 0, 0);
if (error != ZIP_OK) {
ERROR("Error adding member to zipfile");
LXW_ERROR("Error adding member to zipfile");
return error;
}
@ -470,7 +470,7 @@ _add_file_to_zip(lxw_packager *self, FILE * file, const char *filename)
if (size_read < self->buffer_size) {
if (feof(file) == 0) {
ERROR("Error reading member file data");
LXW_ERROR("Error reading member file data");
return ZIP_ERRNO;
}
}
@ -479,7 +479,7 @@ _add_file_to_zip(lxw_packager *self, FILE * file, const char *filename)
self->buffer, (unsigned int) size_read);
if (error < 0) {
ERROR("Error in writing member in the zipfile");
LXW_ERROR("Error in writing member in the zipfile");
return error;
}
@ -492,7 +492,7 @@ _add_file_to_zip(lxw_packager *self, FILE * file, const char *filename)
else {
error = zipCloseFileInZip(self->zipfile);
if (error != ZIP_OK) {
ERROR("Error in closing member in the zipfile");
LXW_ERROR("Error in closing member in the zipfile");
return error;
}
}

1
src/workbook.c
View File

@ -1074,7 +1074,6 @@ workbook_add_format(lxw_workbook *self)
return format;
}
/*
* Call finalisation code and close file.
*/

4
src/worksheet.c
View File

@ -265,10 +265,10 @@ _new_row(lxw_row_t row_num)
if (row->cells)
TAILQ_INIT(row->cells);
else
MEM_ERROR();
LXW_MEM_ERROR();
}
else {
MEM_ERROR();
LXW_MEM_ERROR();
}
return row;