diff options
Diffstat (limited to 'src/Common/libzip/zip_buffer.c')
| -rw-r--r-- | src/Common/libzip/zip_buffer.c | 124 |
1 files changed, 50 insertions, 74 deletions
diff --git a/src/Common/libzip/zip_buffer.c b/src/Common/libzip/zip_buffer.c index 7addc4b6..96010b23 100644 --- a/src/Common/libzip/zip_buffer.c +++ b/src/Common/libzip/zip_buffer.c @@ -39,4 +39,3 @@ zip_uint8_t * -_zip_buffer_data(zip_buffer_t *buffer) -{ +_zip_buffer_data(zip_buffer_t *buffer) { return buffer->data; @@ -46,6 +45,5 @@ _zip_buffer_data(zip_buffer_t *buffer) void -_zip_buffer_free(zip_buffer_t *buffer) -{ +_zip_buffer_free(zip_buffer_t *buffer) { if (buffer == NULL) { - return; + return; } @@ -53,3 +51,3 @@ _zip_buffer_free(zip_buffer_t *buffer) if (buffer->free_data) { - free(buffer->data); + free(buffer->data); } @@ -61,4 +59,3 @@ _zip_buffer_free(zip_buffer_t *buffer) bool -_zip_buffer_eof(zip_buffer_t *buffer) -{ +_zip_buffer_eof(zip_buffer_t *buffer) { return buffer->ok && buffer->offset == buffer->size; @@ -68,4 +65,3 @@ _zip_buffer_eof(zip_buffer_t *buffer) zip_uint8_t * -_zip_buffer_get(zip_buffer_t *buffer, zip_uint64_t length) -{ +_zip_buffer_get(zip_buffer_t *buffer, zip_uint64_t length) { zip_uint8_t *data; @@ -83,4 +79,3 @@ _zip_buffer_get(zip_buffer_t *buffer, zip_uint64_t length) zip_uint16_t -_zip_buffer_get_16(zip_buffer_t *buffer) -{ +_zip_buffer_get_16(zip_buffer_t *buffer) { zip_uint8_t *data = _zip_buffer_get(buffer, 2); @@ -88,3 +83,3 @@ _zip_buffer_get_16(zip_buffer_t *buffer) if (data == NULL) { - return 0; + return 0; } @@ -96,4 +91,3 @@ _zip_buffer_get_16(zip_buffer_t *buffer) zip_uint32_t -_zip_buffer_get_32(zip_buffer_t *buffer) -{ +_zip_buffer_get_32(zip_buffer_t *buffer) { zip_uint8_t *data = _zip_buffer_get(buffer, 4); @@ -101,3 +95,3 @@ _zip_buffer_get_32(zip_buffer_t *buffer) if (data == NULL) { - return 0; + return 0; } @@ -109,4 +103,3 @@ _zip_buffer_get_32(zip_buffer_t *buffer) zip_uint64_t -_zip_buffer_get_64(zip_buffer_t *buffer) -{ +_zip_buffer_get_64(zip_buffer_t *buffer) { zip_uint8_t *data = _zip_buffer_get(buffer, 8); @@ -114,3 +107,3 @@ _zip_buffer_get_64(zip_buffer_t *buffer) if (data == NULL) { - return 0; + return 0; } @@ -121,6 +114,4 @@ _zip_buffer_get_64(zip_buffer_t *buffer) - zip_uint8_t -_zip_buffer_get_8(zip_buffer_t *buffer) -{ +_zip_buffer_get_8(zip_buffer_t *buffer) { zip_uint8_t *data = _zip_buffer_get(buffer, 1); @@ -128,3 +119,3 @@ _zip_buffer_get_8(zip_buffer_t *buffer) if (data == NULL) { - return 0; + return 0; } @@ -136,4 +127,3 @@ _zip_buffer_get_8(zip_buffer_t *buffer) zip_uint64_t -_zip_buffer_left(zip_buffer_t *buffer) -{ +_zip_buffer_left(zip_buffer_t *buffer) { return buffer->ok ? buffer->size - buffer->offset : 0; @@ -143,4 +133,3 @@ _zip_buffer_left(zip_buffer_t *buffer) zip_uint64_t -_zip_buffer_read(zip_buffer_t *buffer, zip_uint8_t *data, zip_uint64_t length) -{ +_zip_buffer_read(zip_buffer_t *buffer, zip_uint8_t *data, zip_uint64_t length) { if (_zip_buffer_left(buffer) < length) { @@ -156,4 +145,3 @@ _zip_buffer_read(zip_buffer_t *buffer, zip_uint8_t *data, zip_uint64_t length) zip_buffer_t * -_zip_buffer_new(zip_uint8_t *data, zip_uint64_t size) -{ +_zip_buffer_new(zip_uint8_t *data, zip_uint64_t size) { bool free_data = (data == NULL); @@ -162,5 +150,5 @@ _zip_buffer_new(zip_uint8_t *data, zip_uint64_t size) if (data == NULL) { - if ((data = (zip_uint8_t *)malloc(size)) == NULL) { - return NULL; - } + if ((data = (zip_uint8_t *)malloc(size)) == NULL) { + return NULL; + } } @@ -168,6 +156,6 @@ _zip_buffer_new(zip_uint8_t *data, zip_uint64_t size) if ((buffer = (zip_buffer_t *)malloc(sizeof(*buffer))) == NULL) { - if (free_data) { - free(data); - } - return NULL; + if (free_data) { + free(data); + } + return NULL; } @@ -185,4 +173,3 @@ _zip_buffer_new(zip_uint8_t *data, zip_uint64_t size) zip_buffer_t * -_zip_buffer_new_from_source(zip_source_t *src, zip_uint64_t size, zip_uint8_t *buf, zip_error_t *error) -{ +_zip_buffer_new_from_source(zip_source_t *src, zip_uint64_t size, zip_uint8_t *buf, zip_error_t *error) { zip_buffer_t *buffer; @@ -190,4 +177,4 @@ _zip_buffer_new_from_source(zip_source_t *src, zip_uint64_t size, zip_uint8_t *b if ((buffer = _zip_buffer_new(buf, size)) == NULL) { - zip_error_set(error, ZIP_ER_MEMORY, 0); - return NULL; + zip_error_set(error, ZIP_ER_MEMORY, 0); + return NULL; } @@ -195,4 +182,4 @@ _zip_buffer_new_from_source(zip_source_t *src, zip_uint64_t size, zip_uint8_t *b if (_zip_read(src, buffer->data, size, error) < 0) { - _zip_buffer_free(buffer); - return NULL; + _zip_buffer_free(buffer); + return NULL; } @@ -204,4 +191,3 @@ _zip_buffer_new_from_source(zip_source_t *src, zip_uint64_t size, zip_uint8_t *b zip_uint64_t -_zip_buffer_offset(zip_buffer_t *buffer) -{ +_zip_buffer_offset(zip_buffer_t *buffer) { return buffer->ok ? buffer->offset : 0; @@ -211,4 +197,3 @@ _zip_buffer_offset(zip_buffer_t *buffer) bool -_zip_buffer_ok(zip_buffer_t *buffer) -{ +_zip_buffer_ok(zip_buffer_t *buffer) { return buffer->ok; @@ -217,6 +202,4 @@ _zip_buffer_ok(zip_buffer_t *buffer) - zip_uint8_t * -_zip_buffer_peek(zip_buffer_t *buffer, zip_uint64_t length) -{ +_zip_buffer_peek(zip_buffer_t *buffer, zip_uint64_t length) { zip_uint8_t *data; @@ -224,4 +207,4 @@ _zip_buffer_peek(zip_buffer_t *buffer, zip_uint64_t length) if (!buffer->ok || buffer->offset + length < length || buffer->offset + length > buffer->size) { - buffer->ok = false; - return NULL; + buffer->ok = false; + return NULL; } @@ -233,4 +216,3 @@ _zip_buffer_peek(zip_buffer_t *buffer, zip_uint64_t length) int -_zip_buffer_put(zip_buffer_t *buffer, const void *src, size_t length) -{ +_zip_buffer_put(zip_buffer_t *buffer, const void *src, size_t length) { zip_uint8_t *dst = _zip_buffer_get(buffer, length); @@ -238,3 +220,3 @@ _zip_buffer_put(zip_buffer_t *buffer, const void *src, size_t length) if (dst == NULL) { - return -1; + return -1; } @@ -247,4 +229,3 @@ _zip_buffer_put(zip_buffer_t *buffer, const void *src, size_t length) int -_zip_buffer_put_16(zip_buffer_t *buffer, zip_uint16_t i) -{ +_zip_buffer_put_16(zip_buffer_t *buffer, zip_uint16_t i) { zip_uint8_t *data = _zip_buffer_get(buffer, 2); @@ -252,3 +233,3 @@ _zip_buffer_put_16(zip_buffer_t *buffer, zip_uint16_t i) if (data == NULL) { - return -1; + return -1; } @@ -263,4 +244,3 @@ _zip_buffer_put_16(zip_buffer_t *buffer, zip_uint16_t i) int -_zip_buffer_put_32(zip_buffer_t *buffer, zip_uint32_t i) -{ +_zip_buffer_put_32(zip_buffer_t *buffer, zip_uint32_t i) { zip_uint8_t *data = _zip_buffer_get(buffer, 4); @@ -268,3 +248,3 @@ _zip_buffer_put_32(zip_buffer_t *buffer, zip_uint32_t i) if (data == NULL) { - return -1; + return -1; } @@ -281,4 +261,3 @@ _zip_buffer_put_32(zip_buffer_t *buffer, zip_uint32_t i) int -_zip_buffer_put_64(zip_buffer_t *buffer, zip_uint64_t i) -{ +_zip_buffer_put_64(zip_buffer_t *buffer, zip_uint64_t i) { zip_uint8_t *data = _zip_buffer_get(buffer, 8); @@ -286,3 +265,3 @@ _zip_buffer_put_64(zip_buffer_t *buffer, zip_uint64_t i) if (data == NULL) { - return -1; + return -1; } @@ -303,4 +282,3 @@ _zip_buffer_put_64(zip_buffer_t *buffer, zip_uint64_t i) int -_zip_buffer_put_8(zip_buffer_t *buffer, zip_uint8_t i) -{ +_zip_buffer_put_8(zip_buffer_t *buffer, zip_uint8_t i) { zip_uint8_t *data = _zip_buffer_get(buffer, 1); @@ -308,3 +286,3 @@ _zip_buffer_put_8(zip_buffer_t *buffer, zip_uint8_t i) if (data == NULL) { - return -1; + return -1; } @@ -318,7 +296,6 @@ _zip_buffer_put_8(zip_buffer_t *buffer, zip_uint8_t i) int -_zip_buffer_set_offset(zip_buffer_t *buffer, zip_uint64_t offset) -{ +_zip_buffer_set_offset(zip_buffer_t *buffer, zip_uint64_t offset) { if (offset > buffer->size) { - buffer->ok = false; - return -1; + buffer->ok = false; + return -1; } @@ -337,4 +314,4 @@ _zip_buffer_skip(zip_buffer_t *buffer, zip_uint64_t length) { if (offset < buffer->offset) { - buffer->ok = false; - return -1; + buffer->ok = false; + return -1; } @@ -344,4 +321,3 @@ _zip_buffer_skip(zip_buffer_t *buffer, zip_uint64_t length) { zip_uint64_t -_zip_buffer_size(zip_buffer_t *buffer) -{ +_zip_buffer_size(zip_buffer_t *buffer) { return buffer->size; |