[illumos-gate merge]

commit cf421650297f304644a9fe84c51540de5823fe84
    9160 libtecla: this statement may fall through
commit 38a641c5970af3d16902370fb738a6792620e1bf
    9155 pkcs11: this statement may fall through
commit d7fdecd2374114124f192b3bfc84d2d294bb45ab
    9154 libldap5: this statement may fall through
commit e10a6edabdc38e5fd1d9da6a6a54774a41f91b22
    9152 loader: allow comma in variable names
commit e501678557789347eedf20b9e0f9a5014f56f18d
    9151 libdhcputil: this statement may fall through
commit 48122e8f03678c2b5a9cea6e9c4d4d2629c5a13f
    9148 sun_sas: this statement may fall through
commit 69b2e41e53282c11528827637e627614e2af615b
    9147 sun_sas: comparison between pointer and zero character constant
commit 59ee40951f56cfa1c0e6c5c6aeea10605267116a
    9138 libcurses: this statement may fall through

3 files changed, 16 insertions, 24 deletions

diff --git a/usr/src/lib/libldap5/sources/ldap/common/friendly.c b/usr/src/lib/libldap5/sources/ldap/common/friendly.c
index 79d602160d..cffccb0f96 100644
--- a/usr/src/lib/libldap5/sources/ldap/common/friendly.c
+++ b/usr/src/lib/libldap5/sources/ldap/common/friendly.c
@@ -2,8 +2,6 @@
  * Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
  * Use is subject to license terms.
  */
-#pragma ident	"%Z%%M%	%I%	%E% SMI"
-
 /*
  * The contents of this file are subject to the Netscape Public
  * License Version 1.1 (the "License"); you may not use this file
@@ -33,12 +31,6 @@
  *  friendly.c
  */
 
-#if 0
-#ifndef lint 
-static char copyright[] = "@(#) Copyright (c) 1993 Regents of the University of Michigan.\nAll rights reserved.\n";
-#endif
-#endif
-
 #include "ldap-int.h"
 
 char *
@@ -53,10 +45,9 @@ ldap_friendly_name( char *filename, char *name, FriendlyMap *map )
 	if ( map == NULL ) {
 		return( name );
 	}
-    if ( NULL == name)
-    {
-        return (name);
-    }
+	if ( name == NULL ) {
+		return(name);
+	}
 
 	if ( *map == NULL ) {
 		if ( (fp = fopen( filename, "rF" )) == NULL )
@@ -98,7 +89,7 @@ ldap_friendly_name( char *filename, char *name, FriendlyMap *map )
 					case '"':
 						if ( !esc )
 							found = 1;
-						/* FALL */
+						/* FALLTHROUGH */
 					default:
 						esc = 0;
 						break;
diff --git a/usr/src/lib/libldap5/sources/ldap/common/getdn.c b/usr/src/lib/libldap5/sources/ldap/common/getdn.c
index 4ab49eef28..db3b93de06 100644
--- a/usr/src/lib/libldap5/sources/ldap/common/getdn.c
+++ b/usr/src/lib/libldap5/sources/ldap/common/getdn.c
@@ -3,8 +3,6 @@
  * All rights reserved.
  */
 
-#pragma ident	"%Z%%M%	%I%	%E% SMI"
-
 /*
  * The contents of this file are subject to the Netscape Public
  * License Version 1.1 (the "License"); you may not use this file
@@ -34,12 +32,6 @@
  *  getdn.c
  */
 
-#if 0
-#ifndef lint 
-static char copyright[] = "@(#) Copyright (c) 1990 Regents of the University of Michigan.\nAll rights reserved.\n";
-#endif
-#endif
-
 #include "ldap-int.h"
 
 char *
@@ -238,6 +230,7 @@ ldap_explode( const char *dn, const int notypes, const int nametype )
 				state = INQUOTE;
 			break;
 		case '+': if ( nametype != LDAP_RDN ) break;
+			/* FALLTHROUGH */
 		case ';':
 		case ',':
 		case '\0':
@@ -323,7 +316,7 @@ ldap_explode( const char *dn, const int notypes, const int nametype )
 			if ( state == OUTQUOTE ) {
 				goteq = 1;
 			}
-			/* FALL */
+			/* FALLTHROUGH */
 		default:
 			plen = LDAP_UTF8LEN(p);
 			break;
diff --git a/usr/src/lib/libldap5/sources/ldap/common/ldaputf8.c b/usr/src/lib/libldap5/sources/ldap/common/ldaputf8.c
index 65bc85a378..b99a43e448 100644
--- a/usr/src/lib/libldap5/sources/ldap/common/ldaputf8.c
+++ b/usr/src/lib/libldap5/sources/ldap/common/ldaputf8.c
@@ -1,5 +1,3 @@
-#pragma ident	"%Z%%M%	%I%	%E% SMI"
-
 /*
  * The contents of this file are subject to the Netscape Public
  * License Version 1.1 (the "License"); you may not use this file
@@ -51,10 +49,15 @@ ldap_utf8next (char* s)
     switch (UTF8len [(*next >> 2) & 0x3F]) {
       case 0: /* erroneous: s points to the middle of a character. */
       case 6: if ((*++next & 0xC0) != 0x80) break;
+	/* FALLTHROUGH */
       case 5: if ((*++next & 0xC0) != 0x80) break;
+	/* FALLTHROUGH */
       case 4: if ((*++next & 0xC0) != 0x80) break;
+	/* FALLTHROUGH */
       case 3: if ((*++next & 0xC0) != 0x80) break;
+	/* FALLTHROUGH */
       case 2: if ((*++next & 0xC0) != 0x80) break;
+	/* FALLTHROUGH */
       case 1: ++next;
     }
     return (char*) next;
@@ -88,10 +91,15 @@ ldap_utf8copy (char* dst, const char* src)
     switch (UTF8len [(*s >> 2) & 0x3F]) {
       case 0: /* erroneous: s points to the middle of a character. */
       case 6: *dst++ = *s++; if ((*s & 0xC0) != 0x80) break;
+	/* FALLTHROUGH */
       case 5: *dst++ = *s++; if ((*s & 0xC0) != 0x80) break;
+	/* FALLTHROUGH */
       case 4: *dst++ = *s++; if ((*s & 0xC0) != 0x80) break;
+	/* FALLTHROUGH */
       case 3: *dst++ = *s++; if ((*s & 0xC0) != 0x80) break;
+	/* FALLTHROUGH */
       case 2: *dst++ = *s++; if ((*s & 0xC0) != 0x80) break;
+	/* FALLTHROUGH */
       case 1: *dst   = *s++;
     }
     return s - (const unsigned char*)src;