From e595bf12d8eab33c7c47585df12e8334eb82a7a2 Mon Sep 17 00:00:00 2001 From: tobozo Date: Mon, 18 Jan 2021 01:52:30 +0100 Subject: [PATCH] Reorder errors --- src/ESP32-targz-lib.cpp | 2 -- src/ESP32-targz-lib.h | 4 ++-- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/src/ESP32-targz-lib.cpp b/src/ESP32-targz-lib.cpp index b0bfaa8..39d6a87 100644 --- a/src/ESP32-targz-lib.cpp +++ b/src/ESP32-targz-lib.cpp @@ -89,9 +89,7 @@ static uint16_t blockmod = GZIP_BUFF_SIZE / TAR_BLOCK_SIZE; static struct GZ::TINF_DATA uzLibDecompressor; static uint16_t gzTarBlockPos = 0; static size_t tarReadGzStreamBytes = 0; -#ifdef ESP8266 size_t min_output_buffer_size = 512; -#endif static bool halt_on_error() { diff --git a/src/ESP32-targz-lib.h b/src/ESP32-targz-lib.h index 91bbf28..15ff3fe 100644 --- a/src/ESP32-targz-lib.h +++ b/src/ESP32-targz-lib.h @@ -122,14 +122,14 @@ typedef enum tarGzErrorCode /* int8_t */ ESP32_TARGZ_FS_READSIZE_ERROR = -102, // no space left on device ESP32_TARGZ_HEAP_TOO_LOW = -103, // not enough heap ESP32_TARGZ_NEEDS_DICT = -104, // gzip dictionnary needs to be enabled + ESP32_TARGZ_UZLIB_PARSE_HEADER_FAILED = -105, // Gz Error when parsing header + ESP32_TARGZ_UZLIB_MALLOC_FAIL = -106, // Gz Error when allocating memory // UZLIB: keeping error values from uzlib.h as is (no offset) ESP32_TARGZ_UZLIB_INVALID_FILE = -2, // Not a valid gzip file ESP32_TARGZ_UZLIB_DATA_ERROR = -3, // Gz Error TINF_DATA_ERROR ESP32_TARGZ_UZLIB_CHKSUM_ERROR = -4, // Gz Error TINF_CHKSUM_ERROR ESP32_TARGZ_UZLIB_DICT_ERROR = -5, // Gz Error TINF_DICT_ERROR - ESP32_TARGZ_UZLIB_PARSE_HEADER_FAILED = -105, // Gz Error when parsing header - ESP32_TARGZ_UZLIB_MALLOC_FAIL = -106, // Gz Error when allocating memory // UPDATE: adding -20 offset to actual error values from Update.h ESP32_TARGZ_UPDATE_ERROR_ABORT = -8, // Updater Error UPDATE_ERROR_ABORT -20 // (12-20) = -8