xlsxwriter 0.0.3 → 0.0.4.pre.2

data/ext/xlsxwriter/libxlsxwriter/src/content_types.c

@@ -72,24 +72,28 @@ lxw_content_types_free(lxw_content_types *content_types)
     if (!content_types)
         return;
 
-    while (!STAILQ_EMPTY(content_types->default_types)) {
-        default_type = STAILQ_FIRST(content_types->default_types);
-        STAILQ_REMOVE_HEAD(content_types->default_types, list_pointers);
-        free(default_type->key);
-        free(default_type->value);
-        free(default_type);
+    if (content_types->default_types) {
+        while (!STAILQ_EMPTY(content_types->default_types)) {
+            default_type = STAILQ_FIRST(content_types->default_types);
+            STAILQ_REMOVE_HEAD(content_types->default_types, list_pointers);
+            free(default_type->key);
+            free(default_type->value);
+            free(default_type);
+        }
+        free(content_types->default_types);
     }
 
-    while (!STAILQ_EMPTY(content_types->overrides)) {
-        override = STAILQ_FIRST(content_types->overrides);
-        STAILQ_REMOVE_HEAD(content_types->overrides, list_pointers);
-        free(override->key);
-        free(override->value);
-        free(override);
+    if (content_types->overrides) {
+        while (!STAILQ_EMPTY(content_types->overrides)) {
+            override = STAILQ_FIRST(content_types->overrides);
+            STAILQ_REMOVE_HEAD(content_types->overrides, list_pointers);
+            free(override->key);
+            free(override->value);
+            free(override);
+        }
+        free(content_types->overrides);
     }
 
-    free(content_types->default_types);
-    free(content_types->overrides);
     free(content_types);
 }
 

data/ext/xlsxwriter/libxlsxwriter/src/core.c

@@ -53,17 +53,17 @@ lxw_core_free(lxw_core *core)
  * Convert a time_t struct to a ISO 8601 style "2010-01-01T00:00:00Z" date.
  */
 static void
-_localtime_to_iso8601_date(time_t *timer, char *str, size_t size)
+_datetime_to_iso8601_date(time_t *timer, char *str, size_t size)
 {
-    struct tm *tmp_localtime;
+    struct tm *tmp_datetime;
     time_t current_time = time(NULL);
 
     if (*timer)
-        tmp_localtime = localtime(timer);
+        tmp_datetime = gmtime(timer);
     else
-        tmp_localtime = localtime(&current_time);
+        tmp_datetime = gmtime(&current_time);
 
-    strftime(str, size - 1, "%Y-%m-%dT%H:%M:%SZ", tmp_localtime);
+    strftime(str, size - 1, "%Y-%m-%dT%H:%M:%SZ", tmp_datetime);
 }
 
 /*****************************************************************************
@@ -144,8 +144,8 @@ _write_dcterms_created(lxw_core *self)
     struct xml_attribute *attribute;
     char datetime[LXW_ATTR_32];
 
-    _localtime_to_iso8601_date(&self->properties->created, datetime,
-                               LXW_ATTR_32);
+    _datetime_to_iso8601_date(&self->properties->created, datetime,
+                              LXW_ATTR_32);
 
     LXW_INIT_ATTRIBUTES();
     LXW_PUSH_ATTRIBUTES_STR("xsi:type", "dcterms:W3CDTF");
@@ -166,8 +166,8 @@ _write_dcterms_modified(lxw_core *self)
     struct xml_attribute *attribute;
     char datetime[LXW_ATTR_32];
 
-    _localtime_to_iso8601_date(&self->properties->created, datetime,
-                               LXW_ATTR_32);
+    _datetime_to_iso8601_date(&self->properties->created, datetime,
+                              LXW_ATTR_32);
 
     LXW_INIT_ATTRIBUTES();
     LXW_PUSH_ATTRIBUTES_STR("xsi:type", "dcterms:W3CDTF");

data/ext/xlsxwriter/libxlsxwriter/src/format.c

@@ -38,7 +38,7 @@ lxw_format_new()
     format->font_index = 0;
     format->has_font = LXW_FALSE;
     format->has_dxf_font = LXW_FALSE;
-    format->font_size = 11;
+    format->font_size = 11.0;
     format->bold = LXW_FALSE;
     format->italic = LXW_FALSE;
     format->font_color = LXW_COLOR_UNSET;
@@ -309,7 +309,7 @@ format_set_font_name(lxw_format *self, const char *font_name)
  * Set the font_size property.
  */
 void
-format_set_font_size(lxw_format *self, uint16_t size)
+format_set_font_size(lxw_format *self, double size)
 {
 
     if (size >= LXW_MIN_FONT_SIZE && size <= LXW_MAX_FONT_SIZE)

data/ext/xlsxwriter/libxlsxwriter/src/packager.c

@@ -12,8 +12,8 @@
 #include "xlsxwriter/hash_table.h"
 #include "xlsxwriter/utility.h"
 
-STATIC uint8_t _add_file_to_zip(lxw_packager *self, FILE * file,
-                                const char *filename);
+STATIC lxw_error _add_file_to_zip(lxw_packager *self, FILE * file,
+                                  const char *filename);
 
 /*
  * Forward declarations.
@@ -37,7 +37,12 @@ STATIC uint8_t _add_file_to_zip(lxw_packager *self, FILE * file,
 #undef SLIST_ENTRY
 
 #include <windows.h>
-#include "../third_party/iowin32.h"
+
+#ifdef USE_SYSTEM_MINIZIP
+#include "minizip/iowin32.h"
+#else
+#include "../third_party/minizip/iowin32.h"
+#endif
 
 zipFile
 _open_zipfile_win32(const char *filename)
@@ -132,11 +137,11 @@ lxw_packager_free(lxw_packager *packager)
 /*
  * Write the workbook.xml file.
  */
-STATIC uint8_t
+STATIC lxw_error
 _write_workbook_file(lxw_packager *self)
 {
     lxw_workbook *workbook = self->workbook;
-    int err;
+    lxw_error err;
 
     workbook->file = lxw_tmpfile(self->tmpdir);
     if (!workbook->file)
@@ -149,20 +154,20 @@ _write_workbook_file(lxw_packager *self)
 
     fclose(workbook->file);
 
-    return 0;
+    return LXW_NO_ERROR;
 }
 
 /*
  * Write the worksheet files.
  */
-STATIC uint8_t
+STATIC lxw_error
 _write_worksheet_files(lxw_packager *self)
 {
     lxw_workbook *workbook = self->workbook;
     lxw_worksheet *worksheet;
     char sheetname[LXW_FILENAME_LENGTH] = { 0 };
     uint16_t index = 1;
-    int err;
+    lxw_error err;
 
     STAILQ_FOREACH(worksheet, workbook->worksheets, list_pointers) {
         lxw_snprintf(sheetname, LXW_FILENAME_LENGTH,
@@ -183,19 +188,20 @@ _write_worksheet_files(lxw_packager *self)
         fclose(worksheet->file);
     }
 
-    return 0;
+    return LXW_NO_ERROR;
 }
 
 /*
  * Write the /xl/media/image?.xml files.
  */
-STATIC uint8_t
+STATIC lxw_error
 _write_image_files(lxw_packager *self)
 {
     lxw_workbook *workbook = self->workbook;
     lxw_worksheet *worksheet;
     lxw_image_options *image;
-    int err;
+    lxw_error err;
+    FILE *image_stream;
 
     char filename[LXW_FILENAME_LENGTH] = { 0 };
     uint16_t index = 1;
@@ -210,29 +216,36 @@ _write_image_files(lxw_packager *self)
             lxw_snprintf(filename, LXW_FILENAME_LENGTH,
                          "xl/media/image%d.%s", index++, image->extension);
 
-            rewind(image->stream);
+            /* Check that the image file exists and can be opened. */
+            image_stream = fopen(image->filename, "rb");
+            if (!image_stream) {
+                LXW_WARN_FORMAT1("Error adding image to xlsx file: file "
+                                 "doesn't exist or can't be opened: %s.",
+                                 image->filename);
+                return LXW_ERROR_CREATING_TMPFILE;
+            }
 
-            err = _add_file_to_zip(self, image->stream, filename);
+            err = _add_file_to_zip(self, image_stream, filename);
             RETURN_ON_ERROR(err);
 
-            fclose(image->stream);
+            fclose(image_stream);
         }
     }
 
-    return 0;
+    return LXW_NO_ERROR;
 }
 
 /*
  * Write the chart files.
  */
-STATIC uint8_t
+STATIC lxw_error
 _write_chart_files(lxw_packager *self)
 {
     lxw_workbook *workbook = self->workbook;
     lxw_chart *chart;
     char sheetname[LXW_FILENAME_LENGTH] = { 0 };
     uint16_t index = 1;
-    int err;
+    lxw_error err;
 
     STAILQ_FOREACH(chart, workbook->ordered_charts, ordered_list_pointers) {
 
@@ -253,13 +266,13 @@ _write_chart_files(lxw_packager *self)
         fclose(chart->file);
     }
 
-    return 0;
+    return LXW_NO_ERROR;
 }
 
 /*
  * Write the drawing files.
  */
-STATIC uint8_t
+STATIC lxw_error
 _write_drawing_files(lxw_packager *self)
 {
     lxw_workbook *workbook = self->workbook;
@@ -267,7 +280,7 @@ _write_drawing_files(lxw_packager *self)
     lxw_drawing *drawing;
     char filename[LXW_FILENAME_LENGTH] = { 0 };
     uint16_t index = 1;
-    int err;
+    lxw_error err;
 
     STAILQ_FOREACH(worksheet, workbook->worksheets, list_pointers) {
         drawing = worksheet->drawing;
@@ -290,21 +303,21 @@ _write_drawing_files(lxw_packager *self)
         }
     }
 
-    return 0;
+    return LXW_NO_ERROR;
 }
 
 /*
  * Write the sharedStrings.xml file.
  */
-STATIC uint8_t
+STATIC lxw_error
 _write_shared_strings_file(lxw_packager *self)
 {
     lxw_sst *sst = self->workbook->sst;
-    int err;
+    lxw_error err;
 
     /* Skip the sharedStrings file if there are no shared strings. */
     if (!sst->string_count)
-        return 0;
+        return LXW_NO_ERROR;
 
     sst->file = lxw_tmpfile(self->tmpdir);
     if (!sst->file)
@@ -317,28 +330,36 @@ _write_shared_strings_file(lxw_packager *self)
 
     fclose(sst->file);
 
-    return 0;
+    return LXW_NO_ERROR;
 }
 
 /*
  * Write the app.xml file.
  */
-STATIC uint8_t
+STATIC lxw_error
 _write_app_file(lxw_packager *self)
 {
     lxw_workbook *workbook = self->workbook;
     lxw_worksheet *worksheet;
     lxw_defined_name *defined_name;
-    lxw_app *app = lxw_app_new();
+    lxw_app *app;
     uint16_t named_range_count = 0;
     char *autofilter;
     char *has_range;
     char number[LXW_ATTR_32] = { 0 };
-    int err;
+    lxw_error err = LXW_NO_ERROR;
+
+    app = lxw_app_new();
+    if (!app) {
+        err = LXW_ERROR_MEMORY_MALLOC_FAILED;
+        goto mem_error;
+    }
 
     app->file = lxw_tmpfile(self->tmpdir);
-    if (!app->file)
-        return LXW_ERROR_CREATING_TMPFILE;
+    if (!app->file) {
+        err = LXW_ERROR_CREATING_TMPFILE;
+        goto mem_error;
+    }
 
     lxw_snprintf(number, LXW_ATTR_32, "%d", self->workbook->num_sheets);
 
@@ -373,114 +394,144 @@ _write_app_file(lxw_packager *self)
     lxw_app_assemble_xml_file(app);
 
     err = _add_file_to_zip(self, app->file, "docProps/app.xml");
-    RETURN_ON_ERROR(err);
 
     fclose(app->file);
 
+mem_error:
     lxw_app_free(app);
 
-    return 0;
+    return err;
 }
 
 /*
  * Write the core.xml file.
  */
-STATIC uint8_t
+STATIC lxw_error
 _write_core_file(lxw_packager *self)
 {
+    lxw_error err = LXW_NO_ERROR;
     lxw_core *core = lxw_core_new();
-    int err;
+
+    if (!core) {
+        err = LXW_ERROR_MEMORY_MALLOC_FAILED;
+        goto mem_error;
+    }
 
     core->file = lxw_tmpfile(self->tmpdir);
-    if (!core->file)
-        return LXW_ERROR_CREATING_TMPFILE;
+    if (!core->file) {
+        err = LXW_ERROR_CREATING_TMPFILE;
+        goto mem_error;
+    }
 
     core->properties = self->workbook->properties;
 
     lxw_core_assemble_xml_file(core);
 
     err = _add_file_to_zip(self, core->file, "docProps/core.xml");
-    RETURN_ON_ERROR(err);
 
     fclose(core->file);
 
+mem_error:
     lxw_core_free(core);
 
-    return 0;
+    return err;
 }
 
 /*
  * Write the custom.xml file.
  */
-STATIC uint8_t
+STATIC lxw_error
 _write_custom_file(lxw_packager *self)
 {
     lxw_custom *custom;
-    int err;
+    lxw_error err = LXW_NO_ERROR;
 
     if (STAILQ_EMPTY(self->workbook->custom_properties))
-        return 0;
+        return LXW_NO_ERROR;
 
     custom = lxw_custom_new();
+    if (!custom) {
+        err = LXW_ERROR_MEMORY_MALLOC_FAILED;
+        goto mem_error;
+    }
 
     custom->file = lxw_tmpfile(self->tmpdir);
-    if (!custom->file)
-        return LXW_ERROR_CREATING_TMPFILE;
+    if (!custom->file) {
+        err = LXW_ERROR_CREATING_TMPFILE;
+        goto mem_error;
+    }
 
     custom->custom_properties = self->workbook->custom_properties;
 
     lxw_custom_assemble_xml_file(custom);
 
     err = _add_file_to_zip(self, custom->file, "docProps/custom.xml");
-    RETURN_ON_ERROR(err);
 
     fclose(custom->file);
 
+mem_error:
     lxw_custom_free(custom);
-
-    return 0;
+    return err;
 }
 
 /*
  * Write the theme.xml file.
  */
-STATIC uint8_t
+STATIC lxw_error
 _write_theme_file(lxw_packager *self)
 {
+    lxw_error err = LXW_NO_ERROR;
     lxw_theme *theme = lxw_theme_new();
-    int err;
+
+    if (!theme) {
+        err = LXW_ERROR_MEMORY_MALLOC_FAILED;
+        goto mem_error;
+    }
 
     theme->file = lxw_tmpfile(self->tmpdir);
-    if (!theme->file)
-        return LXW_ERROR_CREATING_TMPFILE;
+    if (!theme->file) {
+        err = LXW_ERROR_CREATING_TMPFILE;
+        goto mem_error;
+    }
 
     lxw_theme_assemble_xml_file(theme);
 
     err = _add_file_to_zip(self, theme->file, "xl/theme/theme1.xml");
-    RETURN_ON_ERROR(err);
 
     fclose(theme->file);
 
+mem_error:
     lxw_theme_free(theme);
 
-    return 0;
+    return err;
 }
 
 /*
  * Write the styles.xml file.
  */
-STATIC uint8_t
+STATIC lxw_error
 _write_styles_file(lxw_packager *self)
 {
     lxw_styles *styles = lxw_styles_new();
     lxw_hash_element *hash_element;
-    int err;
+    lxw_error err = LXW_NO_ERROR;
+
+    if (!styles) {
+        err = LXW_ERROR_MEMORY_MALLOC_FAILED;
+        goto mem_error;
+    }
 
     /* Copy the unique and in-use formats from the workbook to the styles
      * xf_format list. */
     LXW_FOREACH_ORDERED(hash_element, self->workbook->used_xf_formats) {
         lxw_format *workbook_format = (lxw_format *) hash_element->value;
         lxw_format *style_format = lxw_format_new();
+
+        if (!style_format) {
+            err = LXW_ERROR_MEMORY_MALLOC_FAILED;
+            goto mem_error;
+        }
+
         memcpy(style_format, workbook_format, sizeof(lxw_format));
         STAILQ_INSERT_TAIL(styles->xf_formats, style_format, list_pointers);
     }
@@ -492,25 +543,27 @@ _write_styles_file(lxw_packager *self)
     styles->xf_count = self->workbook->used_xf_formats->unique_count;
 
     styles->file = lxw_tmpfile(self->tmpdir);
-    if (!styles->file)
-        return LXW_ERROR_CREATING_TMPFILE;
+    if (!styles->file) {
+        err = LXW_ERROR_CREATING_TMPFILE;
+        goto mem_error;
+    }
 
     lxw_styles_assemble_xml_file(styles);
 
     err = _add_file_to_zip(self, styles->file, "xl/styles.xml");
-    RETURN_ON_ERROR(err);
 
     fclose(styles->file);
 
+mem_error:
     lxw_styles_free(styles);
 
-    return 0;
+    return err;
 }
 
 /*
  * Write the ContentTypes.xml file.
  */
-STATIC uint8_t
+STATIC lxw_error
 _write_content_types_file(lxw_packager *self)
 {
     lxw_content_types *content_types = lxw_content_types_new();
@@ -518,11 +571,18 @@ _write_content_types_file(lxw_packager *self)
     lxw_worksheet *worksheet;
     char filename[LXW_MAX_ATTRIBUTE_LENGTH] = { 0 };
     uint16_t index = 1;
-    int err;
+    lxw_error err = LXW_NO_ERROR;
+
+    if (!content_types) {
+        err = LXW_ERROR_MEMORY_MALLOC_FAILED;
+        goto mem_error;
+    }
 
     content_types->file = lxw_tmpfile(self->tmpdir);
-    if (!content_types->file)
-        return LXW_ERROR_CREATING_TMPFILE;
+    if (!content_types->file) {
+        err = LXW_ERROR_CREATING_TMPFILE;
+        goto mem_error;
+    }
 
     if (workbook->has_png)
         lxw_ct_add_default(content_types, "png", "image/png");
@@ -560,19 +620,19 @@ _write_content_types_file(lxw_packager *self)
     lxw_content_types_assemble_xml_file(content_types);
 
     err = _add_file_to_zip(self, content_types->file, "[Content_Types].xml");
-    RETURN_ON_ERROR(err);
 
     fclose(content_types->file);
 
+mem_error:
     lxw_content_types_free(content_types);
 
-    return 0;
+    return err;
 }
 
 /*
  * Write the workbook .rels xml file.
  */
-STATIC uint8_t
+STATIC lxw_error
 _write_workbook_rels_file(lxw_packager *self)
 {
     lxw_relationships *rels = lxw_relationships_new();
@@ -580,11 +640,18 @@ _write_workbook_rels_file(lxw_packager *self)
     lxw_worksheet *worksheet;
     char sheetname[LXW_FILENAME_LENGTH] = { 0 };
     uint16_t index = 1;
-    int err;
+    lxw_error err = LXW_NO_ERROR;
+
+    if (!rels) {
+        err = LXW_ERROR_MEMORY_MALLOC_FAILED;
+        goto mem_error;
+    }
 
     rels->file = lxw_tmpfile(self->tmpdir);
-    if (!rels->file)
-        return LXW_ERROR_CREATING_TMPFILE;
+    if (!rels->file) {
+        err = LXW_ERROR_CREATING_TMPFILE;
+        goto mem_error;
+    }
 
     STAILQ_FOREACH(worksheet, workbook->worksheets, list_pointers) {
         lxw_snprintf(sheetname, LXW_FILENAME_LENGTH, "worksheets/sheet%d.xml",
@@ -602,19 +669,20 @@ _write_workbook_rels_file(lxw_packager *self)
     lxw_relationships_assemble_xml_file(rels);
 
     err = _add_file_to_zip(self, rels->file, "xl/_rels/workbook.xml.rels");
-    RETURN_ON_ERROR(err);
 
     fclose(rels->file);
+
+mem_error:
     lxw_free_relationships(rels);
 
-    return 0;
+    return err;
 }
 
 /*
  * Write the worksheet .rels files for worksheets that contain links to
  * external data such as hyperlinks or drawings.
  */
-STATIC uint8_t
+STATIC lxw_error
 _write_worksheet_rels_file(lxw_packager *self)
 {
     lxw_relationships *rels;
@@ -623,7 +691,7 @@ _write_worksheet_rels_file(lxw_packager *self)
     lxw_worksheet *worksheet;
     char sheetname[LXW_FILENAME_LENGTH] = { 0 };
     uint16_t index = 0;
-    int err;
+    lxw_error err;
 
     STAILQ_FOREACH(worksheet, workbook->worksheets, list_pointers) {
 
@@ -634,9 +702,12 @@ _write_worksheet_rels_file(lxw_packager *self)
             continue;
 
         rels = lxw_relationships_new();
+
         rels->file = lxw_tmpfile(self->tmpdir);
-        if (!rels->file)
+        if (!rels->file) {
+            lxw_free_relationships(rels);
             return LXW_ERROR_CREATING_TMPFILE;
+        }
 
         STAILQ_FOREACH(rel, worksheet->external_hyperlinks, list_pointers) {
             lxw_add_worksheet_relationship(rels, rel->type, rel->target,
@@ -654,20 +725,21 @@ _write_worksheet_rels_file(lxw_packager *self)
         lxw_relationships_assemble_xml_file(rels);
 
         err = _add_file_to_zip(self, rels->file, sheetname);
-        RETURN_ON_ERROR(err);
 
         fclose(rels->file);
         lxw_free_relationships(rels);
+
+        RETURN_ON_ERROR(err);
     }
 
-    return 0;
+    return LXW_NO_ERROR;
 }
 
 /*
  * Write the drawing .rels files for worksheets that contain charts or
  * drawings.
  */
-STATIC uint8_t
+STATIC lxw_error
 _write_drawing_rels_file(lxw_packager *self)
 {
     lxw_relationships *rels;
@@ -676,7 +748,7 @@ _write_drawing_rels_file(lxw_packager *self)
     lxw_worksheet *worksheet;
     char sheetname[LXW_FILENAME_LENGTH] = { 0 };
     uint16_t index = 1;
-    int err;
+    lxw_error err;
 
     STAILQ_FOREACH(worksheet, workbook->worksheets, list_pointers) {
 
@@ -684,9 +756,12 @@ _write_drawing_rels_file(lxw_packager *self)
             continue;
 
         rels = lxw_relationships_new();
+
         rels->file = lxw_tmpfile(self->tmpdir);
-        if (!rels->file)
+        if (!rels->file) {
+            lxw_free_relationships(rels);
             return LXW_ERROR_CREATING_TMPFILE;
+        }
 
         STAILQ_FOREACH(rel, worksheet->drawing_links, list_pointers) {
             lxw_add_worksheet_relationship(rels, rel->type, rel->target,
@@ -700,27 +775,35 @@ _write_drawing_rels_file(lxw_packager *self)
         lxw_relationships_assemble_xml_file(rels);
 
         err = _add_file_to_zip(self, rels->file, sheetname);
-        RETURN_ON_ERROR(err);
 
         fclose(rels->file);
         lxw_free_relationships(rels);
+
+        RETURN_ON_ERROR(err);
     }
 
-    return 0;
+    return LXW_NO_ERROR;
 }
 
 /*
  * Write the _rels/.rels xml file.
  */
-STATIC uint8_t
+STATIC lxw_error
 _write_root_rels_file(lxw_packager *self)
 {
     lxw_relationships *rels = lxw_relationships_new();
-    int err;
+    lxw_error err = LXW_NO_ERROR;
+
+    if (!rels) {
+        err = LXW_ERROR_MEMORY_MALLOC_FAILED;
+        goto mem_error;
+    }
 
     rels->file = lxw_tmpfile(self->tmpdir);
-    if (!rels->file)
-        return LXW_ERROR_CREATING_TMPFILE;
+    if (!rels->file) {
+        err = LXW_ERROR_CREATING_TMPFILE;
+        goto mem_error;
+    }
 
     lxw_add_document_relationship(rels, "/officeDocument", "xl/workbook.xml");
 
@@ -739,13 +822,13 @@ _write_root_rels_file(lxw_packager *self)
     lxw_relationships_assemble_xml_file(rels);
 
     err = _add_file_to_zip(self, rels->file, "_rels/.rels");
-    RETURN_ON_ERROR(err);
 
     fclose(rels->file);
 
+mem_error:
     lxw_free_relationships(rels);
 
-    return 0;
+    return err;
 }
 
 /*****************************************************************************
@@ -754,7 +837,7 @@ _write_root_rels_file(lxw_packager *self)
  *
  ****************************************************************************/
 
-STATIC uint8_t
+STATIC lxw_error
 _add_file_to_zip(lxw_packager *self, FILE * file, const char *filename)
 {
     int16_t error = ZIP_OK;
@@ -809,16 +892,17 @@ _add_file_to_zip(lxw_packager *self, FILE * file, const char *filename)
         }
     }
 
-    return 0;
+    return LXW_NO_ERROR;
 }
 
 /*
  * Write the xml files that make up the XLXS OPC package.
  */
-uint8_t
+lxw_error
 lxw_create_package(lxw_packager *self)
 {
-    int8_t error;
+    lxw_error error;
+    int8_t zip_error;
 
     error = _write_worksheet_files(self);
     RETURN_ON_ERROR(error);
@@ -863,15 +947,15 @@ lxw_create_package(lxw_packager *self)
     RETURN_ON_ERROR(error);
 
     error = _write_image_files(self);
-    RETURN_ON_ERROR(error);;
+    RETURN_ON_ERROR(error);
 
     error = _write_root_rels_file(self);
     RETURN_ON_ERROR(error);
 
-    error = zipClose(self->zipfile, NULL);
-    if (error) {
-        RETURN_ON_ZIP_ERROR(error, LXW_ERROR_ZIP_CLOSE);
+    zip_error = zipClose(self->zipfile, NULL);
+    if (zip_error) {
+        RETURN_ON_ZIP_ERROR(zip_error, LXW_ERROR_ZIP_CLOSE);
     }
 
-    return 0;
+    return LXW_NO_ERROR;
 }