Mercurial > illumos > git > illumos-joyent
changeset 24458:0802336e9015
[illumos-gate merge]
commit ccbce734fa32e42c5bcbf1594753738697898823
12124 sort: cast between incompatible function types
commit a1cdd5a67f3bf3e60db3f3a77baef63640ad91a4
12176 util-tests: need ctf commands on path and C locale
commit 50d967713af8725306d090dd29033d9efe924715
12139 make: definition of implicit copy constructor is deprecated
commit d59679dc4ee5ea26c61e7762a3f7a6f74a1f4c2c
12163 mpt_sas: Collateral damage caused by dead SATA disk
| author | Jerry Jelinek <jerry.jelinek@joyent.com> |
|---|---|
| date | Fri, 10 Jan 2020 12:33:15 +0000 |
| parents | 26e87d5dd27f (current diff) e319f0150f01 (diff) |
| children | d3d8a25d61b4 |
| files | usr/src/test/util-tests/cmd/utiltest.ksh usr/src/uts/common/io/scsi/adapters/mpt_sas/mptsas.c |
| diffstat | 6 files changed, 30 insertions(+), 14 deletions(-) [+] |
line wrap: on
line diff
--- a/usr/src/cmd/make/Makefile.com Thu Jan 09 12:20:27 2020 +0000 +++ b/usr/src/cmd/make/Makefile.com Fri Jan 10 12:33:15 2020 +0000 @@ -14,6 +14,7 @@ MAKE_INCLUDE= $(SRC)/cmd/make/include CFLAGS += $(CCVERBOSE) CPPFLAGS += -I$(MAKE_INCLUDE) $(MAKE_DEFS) +CCFLAGS += -_gcc4=-std=gnu++0x # So that it's set even for the libraries we build TEXT_DOMAIN = SUNW_OST_OSCMD
--- a/usr/src/cmd/make/include/mksh/defs.h Thu Jan 09 12:20:27 2020 +0000 +++ b/usr/src/cmd/make/include/mksh/defs.h Fri Jan 10 12:33:15 2020 +0000 @@ -804,6 +804,7 @@ // constructors iterator() : node(0) {} iterator(entry *node_) : node(node_) {} + iterator(const iterator&) = default; // dereference operator Name operator->() const { return node->name; }
--- a/usr/src/cmd/sort/common/initialize.c Thu Jan 09 12:20:27 2020 +0000 +++ b/usr/src/cmd/sort/common/initialize.c Fri Jan 10 12:33:15 2020 +0000 @@ -24,8 +24,6 @@ * Use is subject to license terms. */ -#pragma ident "%Z%%M% %I% %E% SMI" - #include "initialize.h" #ifndef TEXT_DOMAIN @@ -109,6 +107,18 @@ set_signal_jmp(); } +static int +strcoll_cmp(void *s1, void *s2, flag_t f __unused) +{ + return (strcoll(s1, s2)); +} + +static int +wcscoll_cmp(void *s1, void *s2, flag_t f __unused) +{ + return (wcscoll(s1, s2)); +} + void initialize_post(sort_t *S) { @@ -124,7 +134,7 @@ field_initialize(S); if (S->m_single_byte_locale) { - S->m_compare_fn = (cmp_fcn_t)strcoll; + S->m_compare_fn = strcoll_cmp; S->m_coll_convert = field_convert; F = S->m_fields_head; @@ -153,7 +163,7 @@ F = F->f_next; } } else { - S->m_compare_fn = (cmp_fcn_t)wcscoll; + S->m_compare_fn = wcscoll_cmp; S->m_coll_convert = field_convert_wide; F = S->m_fields_head;
--- a/usr/src/test/util-tests/cmd/utiltest.ksh Thu Jan 09 12:20:27 2020 +0000 +++ b/usr/src/test/util-tests/cmd/utiltest.ksh Fri Jan 10 12:33:15 2020 +0000 @@ -17,6 +17,8 @@ # Copyright 2014 Garrett D'Amore <garrett@damore.org> # +export PATH="${PATH}:/opt/onbld/bin/$(uname -p)" +export LC_ALL="C" export MY_TESTS="/opt/util-tests" runner="/opt/test-runner/bin/run"
--- a/usr/src/tools/make/Makefile.com Thu Jan 09 12:20:27 2020 +0000 +++ b/usr/src/tools/make/Makefile.com Fri Jan 10 12:33:15 2020 +0000 @@ -17,5 +17,5 @@ CCC = $(NATIVECCC) CFLAGS = $(NATIVE_CFLAGS) CFLAGS += $(CCVERBOSE) -CCFLAGS = $(NATIVE_CCFLAGS) +CCFLAGS = $(NATIVE_CCFLAGS) -_gcc4=-std=gnu++0x CPPFLAGS = -I$(MAKE_INCLUDE) $(MAKE_DEFS)
--- a/usr/src/uts/common/io/scsi/adapters/mpt_sas/mptsas.c Thu Jan 09 12:20:27 2020 +0000 +++ b/usr/src/uts/common/io/scsi/adapters/mpt_sas/mptsas.c Fri Jan 10 12:33:15 2020 +0000 @@ -14898,9 +14898,11 @@ rval = mptsas_get_target_device_info(mpt, page_address, &dev_handle, &ptgt); if ((rval == DEV_INFO_FAIL_PAGE0) || - (rval == DEV_INFO_FAIL_ALLOC) || - (rval == DEV_INFO_FAIL_GUID)) { - break; + (rval == DEV_INFO_FAIL_ALLOC)) { + break; + } + if (rval == DEV_INFO_FAIL_GUID) { + continue; } mpt->m_dev_handle = dev_handle; @@ -16601,12 +16603,12 @@ rval = mptsas_get_target_device_info(mpt, page_address, &cur_handle, &ptgt); if ((rval == DEV_INFO_FAIL_PAGE0) || - (rval == DEV_INFO_FAIL_ALLOC) || - (rval == DEV_INFO_FAIL_GUID)) { + (rval == DEV_INFO_FAIL_ALLOC)) { break; } if ((rval == DEV_INFO_WRONG_DEVICE_TYPE) || - (rval == DEV_INFO_PHYS_DISK)) { + (rval == DEV_INFO_PHYS_DISK) || + (rval == DEV_INFO_FAIL_GUID)) { continue; } mpt->m_dev_handle = cur_handle; @@ -16671,13 +16673,13 @@ rval = mptsas_get_target_device_info(mpt, page_address, &cur_handle, &tmp_tgt); if ((rval == DEV_INFO_FAIL_PAGE0) || - (rval == DEV_INFO_FAIL_ALLOC) || - (rval == DEV_INFO_FAIL_GUID)) { + (rval == DEV_INFO_FAIL_ALLOC)) { tmp_tgt = NULL; break; } if ((rval == DEV_INFO_WRONG_DEVICE_TYPE) || - (rval == DEV_INFO_PHYS_DISK)) { + (rval == DEV_INFO_PHYS_DISK) || + (rval == DEV_INFO_FAIL_GUID)) { continue; } mpt->m_dev_handle = cur_handle;