diff options
author | asomers <asomers@FreeBSD.org> | 2016-07-14 15:39:31 +0000 |
---|---|---|
committer | asomers <asomers@FreeBSD.org> | 2016-07-14 15:39:31 +0000 |
commit | 108fb2e04bc5562bb8811b8d1af5bd525a0a0b0c (patch) | |
tree | d51ff6ee4f29e6590c5cff2f7b18610cc1ea5857 /cddl | |
parent | e2d901eef26ec970fba6c07323115fc489d73338 (diff) | |
download | FreeBSD-src-108fb2e04bc5562bb8811b8d1af5bd525a0a0b0c.zip FreeBSD-src-108fb2e04bc5562bb8811b8d1af5bd525a0a0b0c.tar.gz |
MFC changes relating to warnings in opensolaris-derived libraries
MFC r257592
MFC r257657
MFC r257638
MFC r257647
MFC r302141
r257592 | sbruno | 2013-11-03 14:05:44 -0700 (Sun, 03 Nov 2013) | 8 lines
This library uses macros to define fprintf behvavior for several object
types The compiler will see the non-string literal arguments to the fprintf
calls and omit warnings for them. Quiese these warnings in contrib code:
cddl/contrib/opensolaris/lib/libnvpair/libnvpair.c:743:12: warning: format
string is not a string literal (potentially insecure) [-Wformat-security]
ARENDER(pctl, nvlist_array, nvl, name, val, nelem);
r257657 | sbruno | 2013-11-04 14:32:07 -0700 (Mon, 04 Nov 2013) | 5 lines
Quiesce warning assigning to void * from const ctf_header_t * by explicity
casting to void * before assignment.
Submitted as Illumos issue 4287
r257638 | sbruno | 2013-11-04 09:15:43 -0700 (Mon, 04 Nov 2013) | 6 lines
Quiesce warning regarding %llf which has no effect.
Submitted as illumos issue #4284
Reviewed by: delphij
r257647 | sbruno | 2013-11-04 12:32:35 -0700 (Mon, 04 Nov 2013) | 4 lines
spelling in comments fixup
Submitted by: Joerg Sonnenberger <joerg@britannica.bec.de>
r302141 | asomers | 2016-06-23 09:02:57 -0600 (Thu, 23 Jun 2016) | 14 lines
Raise the WARNS level in cddl/lib
cddl/lib/libavl/Makefile
cddl/lib/libctf/Makefile
cddl/lib/libnvpair/Makefile
cddl/lib/libumem/Makefile
cddl/lib/libuutil/Makefile
Increase WARNS to the highest working level for each of these
libraries
Sponsored by: Spectra Logic Corp
Diffstat (limited to 'cddl')
-rw-r--r-- | cddl/contrib/opensolaris/common/ctf/ctf_create.c | 2 | ||||
-rw-r--r-- | cddl/contrib/opensolaris/lib/libnvpair/libnvpair.c | 2 | ||||
-rw-r--r-- | cddl/lib/libavl/Makefile | 2 | ||||
-rw-r--r-- | cddl/lib/libctf/Makefile | 2 | ||||
-rw-r--r-- | cddl/lib/libnvpair/Makefile | 11 | ||||
-rw-r--r-- | cddl/lib/libumem/Makefile | 2 | ||||
-rw-r--r-- | cddl/lib/libuutil/Makefile | 2 |
7 files changed, 16 insertions, 7 deletions
diff --git a/cddl/contrib/opensolaris/common/ctf/ctf_create.c b/cddl/contrib/opensolaris/common/ctf/ctf_create.c index c5feb3f..a2ca819 100644 --- a/cddl/contrib/opensolaris/common/ctf/ctf_create.c +++ b/cddl/contrib/opensolaris/common/ctf/ctf_create.c @@ -65,7 +65,7 @@ ctf_create(int *errp) cts.cts_name = _CTF_SECTION; cts.cts_type = SHT_PROGBITS; cts.cts_flags = 0; - cts.cts_data = &hdr; + cts.cts_data = (void *)&hdr; cts.cts_size = sizeof (hdr); cts.cts_entsize = 1; cts.cts_offset = 0; diff --git a/cddl/contrib/opensolaris/lib/libnvpair/libnvpair.c b/cddl/contrib/opensolaris/lib/libnvpair/libnvpair.c index 87f66e0..7ad5141 100644 --- a/cddl/contrib/opensolaris/lib/libnvpair/libnvpair.c +++ b/cddl/contrib/opensolaris/lib/libnvpair/libnvpair.c @@ -210,7 +210,7 @@ NVLIST_PRTFUNC(int32, int32_t, int32_t, "%d") NVLIST_PRTFUNC(uint32, uint32_t, uint32_t, "0x%x") NVLIST_PRTFUNC(int64, int64_t, longlong_t, "%lld") NVLIST_PRTFUNC(uint64, uint64_t, u_longlong_t, "0x%llx") -NVLIST_PRTFUNC(double, double, double, "0x%llf") +NVLIST_PRTFUNC(double, double, double, "0x%f") NVLIST_PRTFUNC(string, char *, char *, "%s") NVLIST_PRTFUNC(hrtime, hrtime_t, hrtime_t, "0x%llx") diff --git a/cddl/lib/libavl/Makefile b/cddl/lib/libavl/Makefile index f4db92f..856d12c 100644 --- a/cddl/lib/libavl/Makefile +++ b/cddl/lib/libavl/Makefile @@ -4,7 +4,7 @@ LIB= avl SRCS= avl.c -WARNS?= 0 +WARNS?= 3 CFLAGS+= -I${.CURDIR}/../../../sys/cddl/compat/opensolaris CFLAGS+= -I${.CURDIR}/../../../sys/cddl/contrib/opensolaris/uts/common diff --git a/cddl/lib/libctf/Makefile b/cddl/lib/libctf/Makefile index 5829111..37103b1 100644 --- a/cddl/lib/libctf/Makefile +++ b/cddl/lib/libctf/Makefile @@ -17,7 +17,7 @@ SRCS= ctf_create.c \ ctf_types.c \ ctf_util.c -WARNS?= 0 +WARNS?= 2 CFLAGS+= -DCTF_OLD_VERSIONS CFLAGS+= -I${.CURDIR}/../../../sys/cddl/compat/opensolaris \ diff --git a/cddl/lib/libnvpair/Makefile b/cddl/lib/libnvpair/Makefile index 695b371..aef3f0b 100644 --- a/cddl/lib/libnvpair/Makefile +++ b/cddl/lib/libnvpair/Makefile @@ -12,7 +12,7 @@ SRCS= libnvpair.c \ opensolaris_nvpair.c \ opensolaris_nvpair_alloc_fixed.c -WARNS?= 0 +WARNS?= 1 CFLAGS+= -I${.CURDIR}/../../../cddl/compat/opensolaris/include CFLAGS+= -I${.CURDIR}/../../../cddl/contrib/opensolaris/lib/libzpool/common CFLAGS+= -I${.CURDIR}/../../../sys/cddl/compat/opensolaris @@ -22,4 +22,13 @@ CFLAGS+= -I${.CURDIR}/../../../sys CFLAGS+= -I${.CURDIR}/../../../cddl/contrib/opensolaris/head CFLAGS+= -I${.CURDIR}/../../../cddl/compat/opensolaris/lib/libumem +# This library uses macros to define fprintf behavior for several object types +# The compiler will see the non-string literal arguments to the fprintf calls and +# omit warnings for them. Quiesce these warnings in contrib code: +# +# cddl/contrib/opensolaris/lib/libnvpair/libnvpair.c:743:12: warning: format +# string is not a string literal (potentially insecure) [-Wformat-security] +# ARENDER(pctl, nvlist_array, nvl, name, val, nelem); +# +CFLAGS+= -Wno-format-security .include <bsd.lib.mk> diff --git a/cddl/lib/libumem/Makefile b/cddl/lib/libumem/Makefile index 0ce73f8..56005aa 100644 --- a/cddl/lib/libumem/Makefile +++ b/cddl/lib/libumem/Makefile @@ -4,7 +4,7 @@ LIB= umem SRCS= umem.c -WARNS?= 0 +WARNS?= 3 CFLAGS+= -I${.CURDIR}/../../../cddl/compat/opensolaris/lib/libumem .include <bsd.lib.mk> diff --git a/cddl/lib/libuutil/Makefile b/cddl/lib/libuutil/Makefile index 7521747..72a7a30 100644 --- a/cddl/lib/libuutil/Makefile +++ b/cddl/lib/libuutil/Makefile @@ -15,7 +15,7 @@ SRCS= avl.c \ uu_pname.c \ uu_strtoint.c -WARNS?= 0 +WARNS?= 1 CFLAGS+= -DNATIVE_BUILD CFLAGS+= -I${.CURDIR}/../../../cddl/contrib/opensolaris/lib/libuutil/common CFLAGS+= -I${.CURDIR}/../../../sys/cddl/compat/opensolaris |