[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

1 files changed, 4 insertions, 13 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;