diff options
Diffstat (limited to 'libsparse')
| -rw-r--r-- | libsparse/Android.mk | 10 | ||||
| -rw-r--r-- | libsparse/defs.h | 23 | ||||
| -rw-r--r-- | libsparse/img2simg.c | 1 | ||||
| -rw-r--r-- | libsparse/include/sparse/sparse.h | 8 | ||||
| -rw-r--r-- | libsparse/output_file.c | 19 | ||||
| -rw-r--r-- | libsparse/sparse.c | 4 | ||||
| -rw-r--r-- | libsparse/sparse_read.c | 16 |
7 files changed, 56 insertions, 25 deletions
diff --git a/libsparse/Android.mk b/libsparse/Android.mk index 9025cc0..02ab412 100644 --- a/libsparse/Android.mk +++ b/libsparse/Android.mk @@ -17,6 +17,7 @@ LOCAL_SRC_FILES := $(libsparse_src_files) LOCAL_MODULE := libsparse_host LOCAL_STATIC_LIBRARIES := libz LOCAL_C_INCLUDES += $(LOCAL_PATH)/include external/zlib +LOCAL_CFLAGS := -Werror include $(BUILD_HOST_STATIC_LIBRARY) @@ -27,6 +28,7 @@ LOCAL_MODULE := libsparse LOCAL_C_INCLUDES += $(LOCAL_PATH)/include external/zlib LOCAL_SHARED_LIBRARIES := \ libz +LOCAL_CFLAGS := -Werror include $(BUILD_SHARED_LIBRARY) @@ -36,6 +38,7 @@ LOCAL_SRC_FILES := $(libsparse_src_files) LOCAL_MODULE := libsparse_static LOCAL_C_INCLUDES += $(LOCAL_PATH)/include external/zlib LOCAL_STATIC_LIBRARIES := libz +LOCAL_CFLAGS := -Werror include $(BUILD_STATIC_LIBRARY) @@ -48,6 +51,7 @@ LOCAL_MODULE_STEM := simg2img LOCAL_STATIC_LIBRARIES := \ libsparse_host \ libz +LOCAL_CFLAGS := -Werror include $(BUILD_HOST_EXECUTABLE) @@ -58,6 +62,7 @@ LOCAL_MODULE := simg2img LOCAL_STATIC_LIBRARIES := \ libsparse_static \ libz +LOCAL_CFLAGS := -Werror include $(BUILD_EXECUTABLE) @@ -69,6 +74,7 @@ LOCAL_MODULE_STEM := img2simg LOCAL_STATIC_LIBRARIES := \ libsparse_host \ libz +LOCAL_CFLAGS := -Werror include $(BUILD_HOST_EXECUTABLE) @@ -78,6 +84,7 @@ LOCAL_MODULE := img2simg LOCAL_STATIC_LIBRARIES := \ libsparse_static \ libz +LOCAL_CFLAGS := -Werror include $(BUILD_EXECUTABLE) @@ -87,6 +94,7 @@ LOCAL_MODULE := simg2simg LOCAL_STATIC_LIBRARIES := \ libsparse_host \ libz +LOCAL_CFLAGS := -Werror include $(BUILD_HOST_EXECUTABLE) @@ -95,5 +103,5 @@ LOCAL_MODULE := simg_dump.py LOCAL_SRC_FILES := simg_dump.py LOCAL_MODULE_CLASS := EXECUTABLES LOCAL_IS_HOST_MODULE := true +LOCAL_CFLAGS := -Werror include $(BUILD_PREBUILT) - diff --git a/libsparse/defs.h b/libsparse/defs.h new file mode 100644 index 0000000..34e63c5 --- /dev/null +++ b/libsparse/defs.h @@ -0,0 +1,23 @@ +/* + * Copyright (C) 2014 The Android Open Source Project + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +#ifndef _LIBSPARSE_DEFS_H_ + +#ifndef __unused +#define __unused __attribute__((__unused__)) +#endif + +#endif /* _LIBSPARSE_DEFS_H_ */ diff --git a/libsparse/img2simg.c b/libsparse/img2simg.c index 6b1caa5..a0db36f 100644 --- a/libsparse/img2simg.c +++ b/libsparse/img2simg.c @@ -47,7 +47,6 @@ int main(int argc, char *argv[]) { int in; int out; - unsigned int i; int ret; struct sparse_file *s; unsigned int block_size = 4096; diff --git a/libsparse/include/sparse/sparse.h b/libsparse/include/sparse/sparse.h index 17d085c..8b757d2 100644 --- a/libsparse/include/sparse/sparse.h +++ b/libsparse/include/sparse/sparse.h @@ -20,6 +20,10 @@ #include <stdbool.h> #include <stdint.h> +#ifdef __cplusplus +extern "C" { +#endif + struct sparse_file; /** @@ -273,4 +277,8 @@ void sparse_file_verbose(struct sparse_file *s); */ extern void (*sparse_print_verbose)(const char *fmt, ...); +#ifdef __cplusplus +} +#endif + #endif diff --git a/libsparse/output_file.c b/libsparse/output_file.c index e63c4a9..cd30800 100644 --- a/libsparse/output_file.c +++ b/libsparse/output_file.c @@ -29,9 +29,10 @@ #include <unistd.h> #include <zlib.h> +#include "defs.h" #include "output_file.h" -#include "sparse_format.h" #include "sparse_crc32.h" +#include "sparse_format.h" #ifndef USE_MINGW #include <sys/mman.h> @@ -264,7 +265,7 @@ static struct output_file_ops gz_file_ops = { .close = gz_file_close, }; -static int callback_file_open(struct output_file *out, int fd) +static int callback_file_open(struct output_file *out __unused, int fd __unused) { return 0; } @@ -287,14 +288,13 @@ static int callback_file_skip(struct output_file *out, int64_t off) return 0; } -static int callback_file_pad(struct output_file *out, int64_t len) +static int callback_file_pad(struct output_file *out __unused, int64_t len __unused) { return -1; } static int callback_file_write(struct output_file *out, void *data, int len) { - int ret; struct output_file_callback *outc = to_output_file_callback(out); return outc->write(outc->priv, data, len); @@ -340,7 +340,7 @@ int read_all(int fd, void *buf, size_t len) static int write_sparse_skip_chunk(struct output_file *out, int64_t skip_len) { chunk_header_t chunk_header; - int ret, chunk; + int ret; if (skip_len % out->block_size) { error("don't care size %"PRIi64" is not a multiple of the block size %u", @@ -367,9 +367,8 @@ static int write_sparse_fill_chunk(struct output_file *out, unsigned int len, uint32_t fill_val) { chunk_header_t chunk_header; - int rnd_up_len, zero_len, count; + int rnd_up_len, count; int ret; - unsigned int i; /* Round up the fill length to a multiple of the block size */ rnd_up_len = ALIGN(len, out->block_size); @@ -535,8 +534,6 @@ static struct sparse_file_ops normal_file_ops = { void output_file_close(struct output_file *out) { - int ret; - out->sparse_ops->write_end_chunk(out); out->ops->close(out); } @@ -631,8 +628,8 @@ static struct output_file *output_file_new_normal(void) } struct output_file *output_file_open_callback(int (*write)(void *, const void *, int), - void *priv, unsigned int block_size, int64_t len, int gz, int sparse, - int chunks, int crc) + void *priv, unsigned int block_size, int64_t len, + int gz __unused, int sparse, int chunks, int crc) { int ret; struct output_file_callback *outc; diff --git a/libsparse/sparse.c b/libsparse/sparse.c index 741e8c6..baa30cd 100644 --- a/libsparse/sparse.c +++ b/libsparse/sparse.c @@ -19,6 +19,7 @@ #include <sparse/sparse.h> +#include "defs.h" #include "sparse_file.h" #include "output_file.h" @@ -189,7 +190,7 @@ int sparse_file_callback(struct sparse_file *s, bool sparse, bool crc, return ret; } -static int out_counter_write(void *priv, const void *data, int len) +static int out_counter_write(void *priv, const void *data __unused, int len) { int64_t *count = priv; *count += len; @@ -278,7 +279,6 @@ int sparse_file_resparse(struct sparse_file *in_s, unsigned int max_len, struct sparse_file **out_s, int out_s_count) { struct backed_block *bb; - unsigned int overhead; struct sparse_file *s; struct sparse_file *tmp; int c = 0; diff --git a/libsparse/sparse_read.c b/libsparse/sparse_read.c index 704bcfa..8e188e9 100644 --- a/libsparse/sparse_read.c +++ b/libsparse/sparse_read.c @@ -29,6 +29,8 @@ #include <sparse/sparse.h> +#include "defs.h" +#include "output_file.h" #include "sparse_crc32.h" #include "sparse_file.h" #include "sparse_format.h" @@ -175,24 +177,19 @@ static int process_fill_chunk(struct sparse_file *s, unsigned int chunk_size, } static int process_skip_chunk(struct sparse_file *s, unsigned int chunk_size, - int fd, unsigned int blocks, unsigned int block, uint32_t *crc32) + int fd __unused, unsigned int blocks, + unsigned int block __unused, uint32_t *crc32) { - int ret; - int chunk; - int64_t len = (int64_t)blocks * s->block_size; - uint32_t fill_val; - uint32_t *fillbuf; - unsigned int i; - if (chunk_size != 0) { return -EINVAL; } if (crc32) { + int64_t len = (int64_t)blocks * s->block_size; memset(copybuf, 0, COPY_BUF_SIZE); while (len) { - chunk = min(len, COPY_BUF_SIZE); + int chunk = min(len, COPY_BUF_SIZE); *crc32 = sparse_crc32(*crc32, copybuf, chunk); len -= chunk; } @@ -364,7 +361,6 @@ static int sparse_file_read_normal(struct sparse_file *s, int fd) int64_t remain = s->len; int64_t offset = 0; unsigned int to_read; - char *ptr; unsigned int i; bool sparse_block; |