[illumos-gate merge]

commit 07eb1aef88b873c5c1036d9cf69820c1ef6a32fb
    11151 libpkcs11: NULL pointer errors
commit c0e21d6af8bfe88f1c49c7c12d4537b663fe9db9
    11150 libdladm: NULL pointer errors
commit c8a3ee0e3658c32402e6bd505596d4fa45bfe17c
    11208 add mdb format character for jazzed-up binary output
    11206 mdb output autowrapping still subtly wrong
    11207 many 64-bit mdb format characters have insufficient width
commit b1e2e3fb17324e9ddf43db264a0c64da7756d9e6
    10936 umem_genasm needs to be stricter about segments
    10937 Clean up umem smatch and cerrwarn
commit 3c308cd1a430039e3b6327544d02ab1a5384066a
    11259 mandoc should allow ERRORS section in all man section 7 variants
commit 3970c09844d4f5e54234620de153ab71a05afbca
    11149 libpkg: NULL pointer errors
commit f00128d8e2d39a5be61357047531dc79fde48623
    11134 libdevinfo: NULL pointer errors
commit 4a014300cea3d870431d7e52aff6781d3c63e5d1
    11143 libscf: NULL pointer errors
commit d60ff33691519a9505afc8818735139f4dfd0c31
    11141 libdtrace: NULL pointer errors
commit 7c207486dba29784d04c67b7d1a97e8cff0a4ff9
    11139 libcpc: NULL pointer errors
commit ce67cb245e522293fca567799070a5cdd4267929
    11131 libtsol: NULL pointer errors
commit 559f8b540657be5e8d59b0b7017058a7ac6ba4bb
    11127 libsip: NULL pointer errors
commit f21450b8fa7a1530d48dc06401e691df1b8965fa
    11121 libadm: NULL pointer errors
commit 5f060f5100426465bddc18c6f81b146ccee30eb8
    11120 libpcidb: NULL pointer errors
commit 22ca2f96318fd461cfbcc23fd450623fe08610a3
    11109 librtld_db: NULL pointer errors
commit 6888a8ba15f151decee7821a09e34fed2fb63513
    11107 mcs: NULL pointer errors
commit 9320f4959b6c72e7a6d056623827091cace259ee
    11106 elfedit: NULL pointer errors
commit fb8f92baa78fdf1ddda6f49125fbd59366393ac8
    11101 libld: NULL pointer errors

	Conflicts:
	usr/src/lib/libumem/amd64/umem_genasm.c

1 files changed, 23 insertions, 27 deletions

diff --git a/usr/src/lib/libsip/common/sip_parse_hdrs.c b/usr/src/lib/libsip/common/sip_parse_hdrs.c
index e7ee91acad..39486323b2 100644
--- a/usr/src/lib/libsip/common/sip_parse_hdrs.c
+++ b/usr/src/lib/libsip/common/sip_parse_hdrs.c
@@ -24,8 +24,6 @@
  * Use is subject to license terms.
  */
 
-#pragma ident	"%Z%%M%	%I%	%E% SMI"
-
 #include <ctype.h>
 #include <errno.h>
 #include <stdlib.h>
@@ -63,9 +61,9 @@ sip_parse_acpt_header(_sip_header_t *sip_header, sip_parsed_header_t **header)
  */
 int
 sip_parse_acpt_encode_header(_sip_header_t *sip_header,
-	sip_parsed_header_t **header)
+    sip_parsed_header_t **header)
 {
-	return (sip_parse_hdr_parser1(sip_header, header, (char)NULL));
+	return (sip_parse_hdr_parser1(sip_header, header, 0));
 }
 
 /*
@@ -75,11 +73,11 @@ sip_parse_acpt_encode_header(_sip_header_t *sip_header,
  */
 int
 sip_parse_acpt_lang_header(_sip_header_t *sip_header,
-	sip_parsed_header_t **header)
+    sip_parsed_header_t **header)
 {
 	if (sip_is_empty_hdr(sip_header))
 		return (sip_parse_hdr_empty(sip_header, header));
-	return (sip_parse_hdr_parser1(sip_header, header, (char)NULL));
+	return (sip_parse_hdr_parser1(sip_header, header, 0));
 }
 
 /*
@@ -132,8 +130,7 @@ sip_parse_allow_header(_sip_header_t *hdr, sip_parsed_header_t **phdr)
 		value->sip_value_start = hdr->sip_hdr_current;
 		value->sip_value_header = parsed_header;
 
-		if (sip_find_separator(hdr, SIP_COMMA, (char)NULL,
-		    (char)NULL, B_FALSE) == 0) {
+		if (sip_find_separator(hdr, SIP_COMMA, 0, 0, B_FALSE) == 0) {
 			multi_value = B_TRUE;
 		}
 
@@ -196,7 +193,7 @@ int
 sip_parse_contentdis_header(_sip_header_t *sip_header,
     sip_parsed_header_t **header)
 {
-	return (sip_parse_hdr_parser1(sip_header, header, (char)NULL));
+	return (sip_parse_hdr_parser1(sip_header, header, 0));
 }
 
 /*
@@ -207,7 +204,7 @@ int
 sip_parse_contentencode_header(_sip_header_t *sip_header,
     sip_parsed_header_t **header)
 {
-	return (sip_parse_hdr_parser1(sip_header, header, (char)NULL));
+	return (sip_parse_hdr_parser1(sip_header, header, 0));
 }
 
 /*
@@ -221,7 +218,7 @@ int
 sip_parse_contentlang_header(_sip_header_t *sip_header,
     sip_parsed_header_t **header)
 {
-	return (sip_parse_hdr_parser1(sip_header, header, (char)NULL));
+	return (sip_parse_hdr_parser1(sip_header, header, 0));
 }
 
 /*
@@ -355,7 +352,7 @@ int
 sip_parse_inreplyto_header(_sip_header_t *sip_header,
     sip_parsed_header_t **header)
 {
-	return (sip_parse_hdr_parser1(sip_header, header, (char)NULL));
+	return (sip_parse_hdr_parser1(sip_header, header, 0));
 }
 
 /*
@@ -449,7 +446,7 @@ int
 sip_parse_privacy_header(_sip_header_t *sip_header,
     sip_parsed_header_t **header)
 {
-	return (sip_parse_hdr_parser1(sip_header, header, (char)NULL));
+	return (sip_parse_hdr_parser1(sip_header, header, 0));
 }
 
 
@@ -460,7 +457,7 @@ int
 sip_parse_require_header(_sip_header_t *sip_header,
     sip_parsed_header_t **header)
 {
-	return (sip_parse_hdr_parser1(sip_header, header, (char)NULL));
+	return (sip_parse_hdr_parser1(sip_header, header, 0));
 }
 
 /*
@@ -570,7 +567,7 @@ sip_parse_support_header(_sip_header_t *sip_header,
 {
 	if (sip_is_empty_hdr(sip_header))
 		return (sip_parse_hdr_empty(sip_header, header));
-	return (sip_parse_hdr_parser1(sip_header, header, (char)NULL));
+	return (sip_parse_hdr_parser1(sip_header, header, 0));
 }
 
 /*
@@ -654,7 +651,7 @@ int
 sip_parse_usupport_header(_sip_header_t *sip_header,
     sip_parsed_header_t **header)
 {
-	return (sip_parse_hdr_parser1(sip_header, header, (char)NULL));
+	return (sip_parse_hdr_parser1(sip_header, header, 0));
 }
 
 /*
@@ -877,7 +874,7 @@ int
 sip_parse_allow_events_header(_sip_header_t *sip_header,
     sip_parsed_header_t **header)
 {
-	return (sip_parse_hdr_parser1(sip_header, header, (char)NULL));
+	return (sip_parse_hdr_parser1(sip_header, header, 0));
 }
 
 /*
@@ -893,18 +890,18 @@ sip_parse_allow_events_header(_sip_header_t *sip_header,
 int
 sip_parse_event_header(_sip_header_t *sip_header, sip_parsed_header_t **header)
 {
-	return (sip_parse_hdr_parser1(sip_header, header, (char)NULL));
+	return (sip_parse_hdr_parser1(sip_header, header, 0));
 }
 
 /*
  * Subscription-State   = "Subscription-State" HCOLON substate-value
- * 			*( SEMI subexp-params )
+ *			*( SEMI subexp-params )
  * substate-value       = "active" / "pending" / "terminated"
  *			/ extension-substate
  * extension-substate   = token
  * subexp-params        =   ("reason" EQUAL event-reason-value)
  *			/ ("expires" EQUAL delta-seconds)*
- * 			/ ("retry-after" EQUAL delta-seconds)
+ *			/ ("retry-after" EQUAL delta-seconds)
  *			/ generic-param
  * event-reason-value   =   "deactivated"
  *				/ "probation"
@@ -919,7 +916,7 @@ int
 sip_parse_substate_header(_sip_header_t *sip_header,
     sip_parsed_header_t **header)
 {
-	return (sip_parse_hdr_parser1(sip_header, header, (char)NULL));
+	return (sip_parse_hdr_parser1(sip_header, header, 0));
 }
 
 /*
@@ -944,7 +941,7 @@ sip_parse_substate_header(_sip_header_t *sip_header,
  * dresponse         =  "response" EQUAL request-digest
  * request-digest    =  LDQUOT 32LHEX RDQUOT
  * auth-param        =  auth-param-name EQUAL
- * 			( token / quoted-string )
+ *			( token / quoted-string )
  * auth-param-name   =  token
  * other-response    =  auth-scheme LWS auth-param
  *			*(COMMA auth-param)
@@ -972,7 +969,7 @@ int
 sip_parse_ainfo_header(_sip_header_t *sip_header,
     sip_parsed_header_t **header)
 {
-	return (sip_parse_hdr_parser1(sip_header, header, (char)NULL));
+	return (sip_parse_hdr_parser1(sip_header, header, 0));
 }
 
 /*
@@ -980,7 +977,7 @@ sip_parse_ainfo_header(_sip_header_t *sip_header,
  * challenge           =  ("Digest" LWS digest-cln *(COMMA digest-cln))
  *				/ other-challenge
  * other-challenge     =  auth-scheme LWS auth-param
- * 				*(COMMA auth-param)
+ *				*(COMMA auth-param)
  * digest-cln          =  realm / domain / nonce
  *				/ opaque / stale / algorithm
  *				/ qop-options / auth-param
@@ -1026,7 +1023,7 @@ int
 sip_parse_preq_header(_sip_header_t *sip_header,
     sip_parsed_header_t **header)
 {
-	return (sip_parse_hdr_parser1(sip_header, header, (char)NULL));
+	return (sip_parse_hdr_parser1(sip_header, header, 0));
 }
 
 /*
@@ -1581,8 +1578,7 @@ sip_parse_cftr_header(_sip_header_t *sip_header, sip_parsed_header_t **header)
 
 		tmp_ptr = sip_header->sip_hdr_current;
 
-		if (sip_find_separator(sip_header, SIP_RAQUOT, (char)NULL,
-		    (char)NULL, B_FALSE)) {
+		if (sip_find_separator(sip_header, SIP_RAQUOT, 0, 0, B_FALSE)) {
 			if (sip_goto_next_value(sip_header) != 0) {
 				sip_free_cftr_header(parsed_header);
 				return (EPROTO);