[illumos-gate merge]

commit c8d9a41c357577f316e58fb2603f85c598f01afb
    11243 Unused headers under usr/src/uts/sun4u/sys
commit 2dda0e7f85eecc34a1f266469e66651eab1fa7ce
    11242 Unused files in usr/src/cmd/logins
commit 6da5c920d0507dbc9e0e4416dcb9457827560df9
    11241 usr/src/lib/libpkg/THIRDPARTYLICENSE.descrip is unused
commit 5abf55fdc38fe5c2d8881a37a662d372c23fd0aa
    11240 usr/src/pkg/proto_list_ihv_i386 is unused
commit 57884e4a5db25b4d70c3565a0e07980fd7820c1e
    11302 csh: NULL pointer errors
commit 4c719f3bd8ab1791d6763012560603c65390008c
    11301 cpio: NULL pointer errors
commit ee0bd0a5a4b4a9cdbe27d56415fe460db258a9ef
    11331 A typo in usr/src/man/man1/ls.1
commit 3fa8bc2d19bd24fbc2061549c236b6f7573471e8
    11325 SES-3 element index handling incorrect
commit 3d4dea7f235476fb40c0a6d84dcedfd04740f96b
    11299 csplit: NULL pointer errors
commit d95bfcb7b300250d00a64080d6da927b04ac4697
    11298 consadm: NULL pointer errors
commit 0f063ce817df80cc8fb489abe02246d3d750d2fd
    11297 chmod: NULL pointer errors
commit 95c745183e701047fab8e4753d4e8bc1dd1323e7
    11296 cmd-inet: NULL pointer errors
commit 89b213ac9ac098a69d51b5e8693bd6b8d51864a8
    11314 Provide psm_get_ipivect even on single CPU systems
commit 619456cb54d66ca9736dc29a93b6bb375f41db14
    11321 eeprom: NULL pointer errors
commit eeec397864011c5afca614fe1353754d7a9d852f
    11320 diskinfo: NULL pointer errors
commit 5f8fc372c68f2e0f1544c42850078877e5e2da3a
    11318 svc: NULL pointer errors
commit ff8e166f73f3bfaeac25d65662c6469130892500
    11312 dladm: NULL pointer errors
commit 1376f37367e2b1424b82940f492f2ed488f1b843
    11311 devctl: NULL pointer errors
commit e4fb8a5fd5bb5a5d316430c6ac8f6d33704fcf5d
    11295 lp: NULL pointer errors
commit 07c94cbf80ccbba93ea61425c2074f6bfd608a19
    11294 abi: NULL pointer errors
commit beb02e13b243c53c69d40b808b9ce43bafe55b88
    11293 cfgadm: NULL pointer errors
commit 8d499c80c8e6e058669db8815577bc1d4dca9af0
    11022 Offload Data Transfer (ODX) support
commit 252bc4b276969afed9d61561c1a53f4cad070a6b
    11021 more SMB2 ioctls
commit 55f0a249fd3511728b02627190771a4ce4ddf20e
    11020 want SMB2 ioctl FSCTL_SRV_COPYCHUNK
commit 98e973578ca69ba3ce659c761190cbf3558d359c
    11292 allocate: NULL pointer errors
commit 82be58ff71c54701f4bfbbb526b4ea3d8f899c22
    11289 backup: NULL pointer errors
commit 09f57adea580808a172a5b3e84bf41dc7e0cee6d
    11291 bnu: NULL pointer errors
commit 6473113318cb70acc95fbd8ac12c39566c7b9ee1
    11285 audio: NULL pointer errors
commit 23b5da0c3a749777311c1644e6ed463cc072104c
    11288 bootadm: NULL pointer errors
commit b04056ece904a6664d34ccc4015b5373e959983e
    11287 acct: NULL pointer errors
commit 5f2732295e86666b0e9cf16ad42da252d29d0e40
    11286 bart: NULL pointer errors
commit 1c124bccd08a671182130ddf2af8e454734b3897
    10255 SES temperature thresholds 20 degrees too hot
commit 6a6cfa5d0723a95a9ad915bdb8ca2c9731449041
    11267 Add rust demangling support
commit 773dbec304e9344130c5ae4aa5fc8db5419ff779
    11268 Add custom allocators to libcustr
commit 09cb6b0fb8744ab06f86a15ad49eb1f39c6fcbf1
    11280 custr in belt but not braces, bungles vsnprintf() buffer length
commit ff168298deb08c70659ec1a8645952dee5150368
    11165 libshare: NULL pointer errors
commit f810c7e5159aec14e1937d86287a006e755d3d99
    11164 libkmf: NULL pointer errors
commit 67d74cc3e7c9d9461311136a0b2069813a3fd927
    11102 rtld: NULL pointer errors
commit f39d86306993aa102221c6e62702f1de6cc3f56c
    11116 libgen: NULL pointer errors
commit b168296d3fe15e5a2f992bf6af96993c6756ff3a
    11155 brand: NULL pointer errors
commit 6f6dd2ca9f4a235a0b2ab596d23cbbfd44d684f6
    11113 libgss: NULL pointer errors
commit c75682cd39b9b3d382ce1b01fef06a84ca7ea0a9
    11133 libproc: NULL pointer errors
commit 6e6545bfaed3bab9ce836ee82d1abd8f2edba89a
    11169 nsswitch: NULL pointer errors
commit f5f1a62e51e5e35359add22ba492c3e3a8f12654
    11146 libmapid: NULL pointer errors
commit 6afa3d1d6776a3db46447deaa893bd35c9b53c0a
    11147 libinetsvc: NULL pointer errrors
commit c3e74f84d7edf7b5144c2401d7fefd666a92e6c0
    11122 libc_db: NULL pointer errors

	Conflicts:
	usr/src/lib/libdemangle/common/rust.c
	usr/src/test/util-tests/tests/demangle/Makefile

1 files changed, 18 insertions, 18 deletions

diff --git a/usr/src/cmd/dladm/dladm.c b/usr/src/cmd/dladm/dladm.c
index 97fc010fa2..2de38a993c 100644
--- a/usr/src/cmd/dladm/dladm.c
+++ b/usr/src/cmd/dladm/dladm.c
@@ -450,7 +450,7 @@ static const struct option lopts[] = {
 	{"bw-limit",	required_argument,	0, 'b'},
 	{"mac-address",	required_argument,	0, 'm'},
 	{"slot",	required_argument,	0, 'n'},
-	{ 0, 0, 0, 0 }
+	{ NULL, 0, NULL, 0 }
 };
 
 static const struct option show_lopts[] = {
@@ -463,7 +463,7 @@ static const struct option show_lopts[] = {
 	{"output",	required_argument,	0, 'o'},
 	{"persistent",	no_argument,		0, 'P'},
 	{"lacp",	no_argument,		0, 'L'},
-	{ 0, 0, 0, 0 }
+	{ NULL, 0, NULL, 0 }
 };
 
 static const struct option iptun_lopts[] = {
@@ -474,7 +474,7 @@ static const struct option iptun_lopts[] = {
 	{"parsable",	no_argument,		0, 'p'},
 	{"parseable",	no_argument,		0, 'p'},
 	{"persistent",	no_argument,		0, 'P'},
-	{ 0, 0, 0, 0 }
+	{ NULL, 0, NULL, 0 }
 };
 
 static char * const iptun_addropts[] = {
@@ -502,7 +502,7 @@ static const struct option prop_longopts[] = {
 	{"parsable",	no_argument,		0, 'c'  },
 	{"parseable",	no_argument,		0, 'c'  },
 	{"persistent",	no_argument,		0, 'P'  },
-	{ 0, 0, 0, 0 }
+	{ NULL, 0, NULL, 0 }
 };
 
 static const struct option wifi_longopts[] = {
@@ -522,7 +522,7 @@ static const struct option wifi_longopts[] = {
 	{"root-dir",	required_argument,	0, 'R'  },
 	{"persistent",	no_argument,		0, 'P'  },
 	{"file",	required_argument,	0, 'f'  },
-	{ 0, 0, 0, 0 }
+	{ NULL, 0, NULL, 0 }
 };
 
 static const struct option showeth_lopts[] = {
@@ -530,7 +530,7 @@ static const struct option showeth_lopts[] = {
 	{"parseable",	no_argument,		0, 'p'	},
 	{"extended",	no_argument,		0, 'x'	},
 	{"output",	required_argument,	0, 'o'	},
-	{ 0, 0, 0, 0 }
+	{ NULL, 0, NULL, 0 }
 };
 
 static const struct option vnic_lopts[] = {
@@ -544,7 +544,7 @@ static const struct option vnic_lopts[] = {
 	{"mac-prefix",	required_argument,	0, 'r'	},
 	{"vrid",	required_argument,	0, 'V'	},
 	{"address-family",	required_argument,	0, 'A'	},
-	{ 0, 0, 0, 0 }
+	{ NULL, 0, NULL, 0 }
 };
 
 static const struct option part_lopts[] = {
@@ -554,7 +554,7 @@ static const struct option part_lopts[] = {
 	{"force",	no_argument,		0, 'f'  },
 	{"root-dir",	required_argument,	0, 'R'  },
 	{"prop",	required_argument,	0, 'p'  },
-	{ 0, 0, 0, 0 }
+	{ NULL, 0, NULL, 0 }
 };
 
 static const struct option show_part_lopts[] = {
@@ -563,13 +563,13 @@ static const struct option show_part_lopts[] = {
 	{"link",	required_argument,	0, 'l'  },
 	{"persistent",	no_argument,		0, 'P'  },
 	{"output",	required_argument,	0, 'o'  },
-	{ 0, 0, 0, 0 }
+	{ NULL, 0, NULL, 0 }
 };
 
 static const struct option etherstub_lopts[] = {
 	{"temporary",	no_argument,		0, 't'	},
 	{"root-dir",	required_argument,	0, 'R'	},
-	{ 0, 0, 0, 0 }
+	{ NULL, 0, NULL, 0 }
 };
 
 static const struct option usage_opts[] = {
@@ -577,7 +577,7 @@ static const struct option usage_opts[] = {
 	{"format",	required_argument,	0, 'F'	},
 	{"start",	required_argument,	0, 's'	},
 	{"stop",	required_argument,	0, 'e'	},
-	{ 0, 0, 0, 0 }
+	{ NULL, 0, NULL, 0 }
 };
 
 static const struct option simnet_lopts[] = {
@@ -585,7 +585,7 @@ static const struct option simnet_lopts[] = {
 	{"root-dir",	required_argument,	0, 'R'	},
 	{"media",	required_argument,	0, 'm'	},
 	{"peer",	required_argument,	0, 'p'	},
-	{ 0, 0, 0, 0 }
+	{ NULL, 0, NULL, 0 }
 };
 
 static const struct option bridge_lopts[] = {
@@ -597,7 +597,7 @@ static const struct option bridge_lopts[] = {
 	{ "link",		required_argument,	0, 'l'	},
 	{ "max-age",		required_argument,	0, 'm'	},
 	{ "priority",		required_argument,	0, 'p'	},
-	{ NULL, NULL, 0, 0 }
+	{ NULL, 0, NULL, 0 }
 };
 
 static const struct option bridge_show_lopts[] = {
@@ -609,7 +609,7 @@ static const struct option bridge_show_lopts[] = {
 	{ "parseable",	no_argument,		0, 'p' },
 	{ "statistics",	no_argument,		0, 's' },
 	{ "trill",	no_argument,		0, 't' },
-	{ 0, 0, 0, 0 }
+	{ NULL, 0, NULL, 0 }
 };
 
 /*
@@ -862,7 +862,7 @@ static const ofmt_field_t phys_fields[] = {
 	offsetof(link_fields_buf_t, link_phys_device), print_default_cb},
 { "FLAGS",	7,
 	offsetof(link_fields_buf_t, link_flags), print_default_cb},
-{ NULL,		0, NULL, 0}}
+{ NULL,		0, 0, NULL}}
 ;
 
 /*
@@ -6348,7 +6348,7 @@ parse_wlan_keys(char *str, dladm_wlan_key_t **keys, uint_t *key_countp)
 	char			*field, *token, *lasts = NULL, c;
 
 	token = str;
-	while ((c = *token++) != NULL) {
+	while ((c = *token++) != '\0') {
 		if (c == ',')
 			nfields++;
 	}
@@ -7553,7 +7553,7 @@ do_delete_secobj(int argc, char **argv, const char *use)
 		die("secure object name required");
 
 	token = argv[optind];
-	while ((c = *token++) != NULL) {
+	while ((c = *token++) != '\0') {
 		if (c == ',')
 			nfields++;
 	}
@@ -7706,7 +7706,7 @@ do_show_secobj(int argc, char **argv, const char *use)
 		token = argv[optind];
 		if (token == NULL)
 			die("secure object name required");
-		while ((c = *token++) != NULL) {
+		while ((c = *token++) != '\0') {
 			if (c == ',')
 				obj_fields++;
 		}