diff options
author | Aurimas Liutikas <aurimas@google.com> | 2016-10-27 23:47:51 +0000 |
---|---|---|
committer | android-build-merger <android-build-merger@google.com> | 2016-10-27 23:47:51 +0000 |
commit | 2fd2c48cd3c38de1f1f10a369b99c23ff1cda96a (patch) | |
tree | 1928693a14857dfd417bdb82115660e25dd6fe59 | |
parent | 06fb3122758d5e9200ea7aa0560a39bb3db7597e (diff) | |
parent | 8ca4df28c5f8034f90984c14caea2b74f0e64910 (diff) | |
download | gptfdisk-2fd2c48cd3c38de1f1f10a369b99c23ff1cda96a.tar.gz |
Merge "Fix all warnings and enable -Werror for gptfdisk." am: 2c054ab90e am: 7424963b5b
am: 8ca4df28c5
Change-Id: Ie58fbffc4818d693e87214add20daa5be558ed84
-rw-r--r-- | Android.mk | 2 | ||||
-rw-r--r-- | attributes.cc | 2 | ||||
-rw-r--r-- | basicmbr.cc | 2 | ||||
-rw-r--r-- | bsd.cc | 2 | ||||
-rw-r--r-- | crc32.cc | 2 | ||||
-rw-r--r-- | diskio-unix.cc | 2 | ||||
-rw-r--r-- | diskio.cc | 2 | ||||
-rw-r--r-- | gpt.cc | 2 | ||||
-rw-r--r-- | gptcl.cc | 2 | ||||
-rw-r--r-- | gptpart.cc | 2 | ||||
-rw-r--r-- | guid.cc | 2 | ||||
-rw-r--r-- | mbr.cc | 2 | ||||
-rw-r--r-- | mbrpart.cc | 2 | ||||
-rw-r--r-- | parttypes.cc | 2 | ||||
-rw-r--r-- | support.cc | 2 |
15 files changed, 28 insertions, 2 deletions
@@ -24,6 +24,7 @@ LOCAL_CPP_EXTENSION := .cc LOCAL_C_INCLUDES := $(LOCAL_PATH) external/e2fsprogs/lib LOCAL_SRC_FILES := $(sgdisk_src_files) +LOCAL_CFLAGS += -Wno-unused-parameter -Werror LOCAL_SHARED_LIBRARIES := libext2_uuid @@ -41,6 +42,7 @@ endif LOCAL_C_INCLUDES := $(LOCAL_PATH) external/e2fsprogs/lib LOCAL_SRC_FILES := $(sgdisk_src_files) +LOCAL_CFLAGS += -Wno-unused-parameter -Werror LOCAL_SHARED_LIBRARIES := libext2_uuid-host diff --git a/attributes.cc b/attributes.cc index f3cd585..bbd5aad 100644 --- a/attributes.cc +++ b/attributes.cc @@ -7,7 +7,9 @@ under the terms of the GNU GPL version 2, as detailed in the COPYING file. */ #define __STDC_LIMIT_MACROS +#ifndef __STDC_CONSTANT_MACROS #define __STDC_CONSTANT_MACROS +#endif #include <stdint.h> #include <stdio.h> diff --git a/basicmbr.cc b/basicmbr.cc index 5661487..c3c0653 100644 --- a/basicmbr.cc +++ b/basicmbr.cc @@ -7,7 +7,9 @@ under the terms of the GNU GPL version 2, as detailed in the COPYING file. */ #define __STDC_LIMIT_MACROS +#ifndef __STDC_CONSTANT_MACROS #define __STDC_CONSTANT_MACROS +#endif #include <stdio.h> #include <stdlib.h> @@ -7,7 +7,9 @@ under the terms of the GNU GPL version 2, as detailed in the COPYING file. */ #define __STDC_LIMIT_MACROS +#ifndef __STDC_CONSTANT_MACROS #define __STDC_CONSTANT_MACROS +#endif #include <stdio.h> //#include <unistd.h> @@ -31,7 +31,7 @@ uint32_t crc_tab[256]; */
uint32_t chksum_crc32 (unsigned char *block, unsigned int length)
{
- register unsigned long crc;
+ unsigned long crc;
unsigned long i;
crc = 0xFFFFFFFF;
diff --git a/diskio-unix.cc b/diskio-unix.cc index af71cdb..75fad2e 100644 --- a/diskio-unix.cc +++ b/diskio-unix.cc @@ -13,7 +13,9 @@ // under the terms of the GNU GPL version 2, as detailed in the COPYING file. #define __STDC_LIMIT_MACROS +#ifndef __STDC_CONSTANT_MACROS #define __STDC_CONSTANT_MACROS +#endif #include <sys/ioctl.h> #include <string.h> @@ -13,7 +13,9 @@ // under the terms of the GNU GPL version 2, as detailed in the COPYING file. #define __STDC_LIMIT_MACROS +#ifndef __STDC_CONSTANT_MACROS #define __STDC_CONSTANT_MACROS +#endif #ifdef _WIN32 #include <windows.h> @@ -7,7 +7,9 @@ under the terms of the GNU GPL version 2, as detailed in the COPYING file. */ #define __STDC_LIMIT_MACROS +#ifndef __STDC_CONSTANT_MACROS #define __STDC_CONSTANT_MACROS +#endif #include <stdio.h> #include <stdlib.h> @@ -109,7 +109,7 @@ int GPTDataCL::DoOptions(int argc, char* argv[]) { {"version", 'V', POPT_ARG_NONE, NULL, 'V', "display version information", ""}, {"zap", 'z', POPT_ARG_NONE, NULL, 'z', "zap (destroy) GPT (but not MBR) data structures", ""}, {"zap-all", 'Z', POPT_ARG_NONE, NULL, 'Z', "zap (destroy) GPT and MBR data structures", ""}, - POPT_AUTOHELP { NULL, 0, 0, NULL, 0 } + POPT_AUTOHELP { NULL, 0, 0, NULL, 0, NULL, NULL } }; // Create popt context... @@ -13,7 +13,9 @@ // under the terms of the GNU GPL version 2, as detailed in the COPYING file. #define __STDC_LIMIT_MACROS +#ifndef __STDC_CONSTANT_MACROS #define __STDC_CONSTANT_MACROS +#endif #ifdef USE_UTF16 #include <unicode/ustdio.h> @@ -12,7 +12,9 @@ // #define __STDC_LIMIT_MACROS +#ifndef __STDC_CONSTANT_MACROS #define __STDC_CONSTANT_MACROS +#endif #include <stdio.h> #include <time.h> @@ -7,7 +7,9 @@ under the terms of the GNU GPL version 2, as detailed in the COPYING file. */ #define __STDC_LIMIT_MACROS +#ifndef __STDC_CONSTANT_MACROS #define __STDC_CONSTANT_MACROS +#endif #include <stdio.h> #include <stdlib.h> @@ -18,7 +18,9 @@ */ #define __STDC_LIMIT_MACROS +#ifndef __STDC_CONSTANT_MACROS #define __STDC_CONSTANT_MACROS +#endif #include <stddef.h> #include <stdint.h> diff --git a/parttypes.cc b/parttypes.cc index 175aca5..47c0f72 100644 --- a/parttypes.cc +++ b/parttypes.cc @@ -6,7 +6,9 @@ under the terms of the GNU GPL version 2, as detailed in the COPYING file. */ #define __STDC_LIMIT_MACROS +#ifndef __STDC_CONSTANT_MACROS #define __STDC_CONSTANT_MACROS +#endif #include <string.h> #include <stdint.h> @@ -7,7 +7,9 @@ under the terms of the GNU GPL version 2, as detailed in the COPYING file. */ #define __STDC_LIMIT_MACROS +#ifndef __STDC_CONSTANT_MACROS #define __STDC_CONSTANT_MACROS +#endif #include <stdio.h> #include <stdint.h> |