diff options
Diffstat (limited to 'usr/src/lib/libldap5/sources/ldap')
| -rw-r--r-- | usr/src/lib/libldap5/sources/ldap/ber/io.c | 2 | ||||
| -rw-r--r-- | usr/src/lib/libldap5/sources/ldap/common/friendly.c | 17 | ||||
| -rw-r--r-- | usr/src/lib/libldap5/sources/ldap/common/getdn.c | 11 | ||||
| -rw-r--r-- | usr/src/lib/libldap5/sources/ldap/common/ldaputf8.c | 12 |
4 files changed, 17 insertions, 25 deletions
diff --git a/usr/src/lib/libldap5/sources/ldap/ber/io.c b/usr/src/lib/libldap5/sources/ldap/ber/io.c index 26d3b7da3a..67e8b775ce 100644 --- a/usr/src/lib/libldap5/sources/ldap/ber/io.c +++ b/usr/src/lib/libldap5/sources/ldap/ber/io.c @@ -870,7 +870,7 @@ ber_sockbuf_set_option( Sockbuf *sb, int option, void *value ) switch ( option ) { case LBER_SOCKBUF_OPT_MAX_INCOMING_SIZE: sb->sb_max_incoming = *((ber_uint_t *) value); - /* FALL */ + /* FALLTHROUGH */ case LBER_SOCKBUF_OPT_TO_FILE: case LBER_SOCKBUF_OPT_TO_FILE_ONLY: case LBER_SOCKBUF_OPT_NO_READ_AHEAD: 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; |