Esthetic change: Move break; out of if() to before the next case:

This commit is contained in:
Hallvard Furuseth 2002-12-02 15:46:53 +00:00
parent cccc8702c6
commit 334ff687d6
7 changed files with 36 additions and 42 deletions

View File

@ -216,8 +216,7 @@ main( int argc, char **argv )
assert( authzid == NULL );
authzid = control;
break;
} else if ( strcasecmp( control, "manageDSAit" ) == 0 ) {
if( manageDSAit ) {
fprintf( stderr, "manageDSAit control previously specified\n");
@ -230,8 +229,7 @@ main( int argc, char **argv )
}
manageDSAit = 1 + crit;
break;
} else if ( strcasecmp( control, "noop" ) == 0 ) {
if( noop ) {
fprintf( stderr, "noop control previously specified\n");
@ -244,13 +242,14 @@ main( int argc, char **argv )
}
noop = 1 + crit;
break;
} else {
fprintf( stderr, "Invalid general control name: %s\n", control );
usage(prog);
return EXIT_FAILURE;
}
break;
case 'h': /* ldap host */
if( ldapuri != NULL ) {
fprintf( stderr, "%s: -h incompatible with -H\n", prog );
@ -406,7 +405,8 @@ main( int argc, char **argv )
prog );
usage( prog );
return( EXIT_FAILURE );
} break;
}
break;
case 'Q':
#ifdef HAVE_CYRUS_SASL
if( version == LDAP_VERSION2 ) {

View File

@ -215,8 +215,7 @@ main( int argc, char **argv )
assert( authzid == NULL );
authzid = control;
break;
} else if ( strcasecmp( control, "manageDSAit" ) == 0 ) {
if( manageDSAit ) {
fprintf( stderr, "manageDSAit control previously specified\n");
@ -229,8 +228,7 @@ main( int argc, char **argv )
}
manageDSAit = 1 + crit;
break;
} else if ( strcasecmp( control, "noop" ) == 0 ) {
if( noop ) {
fprintf( stderr, "noop control previously specified\n");
@ -243,13 +241,13 @@ main( int argc, char **argv )
}
noop = 1 + crit;
break;
} else {
fprintf( stderr, "Invalid general control name: %s\n", control );
usage(prog);
return EXIT_FAILURE;
}
break;
case 'h': /* ldap host */
if( ldapuri != NULL ) {
fprintf( stderr, "%s: -h incompatible with -H\n", prog );
@ -405,7 +403,8 @@ main( int argc, char **argv )
prog );
usage( prog );
return( EXIT_FAILURE );
} break;
}
break;
case 'Q':
#ifdef HAVE_CYRUS_SASL
if( version == LDAP_VERSION2 ) {

View File

@ -279,8 +279,7 @@ main( int argc, char **argv )
assert( authzid == NULL );
authzid = control;
break;
} else if ( strcasecmp( control, "manageDSAit" ) == 0 ) {
if( manageDSAit ) {
fprintf( stderr, "manageDSAit control previously specified\n");
@ -293,8 +292,7 @@ main( int argc, char **argv )
}
manageDSAit = 1 + crit;
break;
} else if ( strcasecmp( control, "noop" ) == 0 ) {
if( noop ) {
fprintf( stderr, "noop control previously specified\n");
@ -307,13 +305,13 @@ main( int argc, char **argv )
}
noop = 1 + crit;
break;
} else {
fprintf( stderr, "Invalid general control name: %s\n", control );
usage(prog);
return EXIT_FAILURE;
}
break;
case 'h': /* ldap host */
if( ldapuri != NULL ) {
fprintf( stderr, "%s: -h incompatible with -H\n", prog );
@ -469,7 +467,8 @@ main( int argc, char **argv )
prog );
usage( prog );
return( EXIT_FAILURE );
} break;
}
break;
case 'Q':
#ifdef HAVE_CYRUS_SASL
if( version == LDAP_VERSION2 ) {

View File

@ -235,8 +235,7 @@ main(int argc, char **argv)
assert( authzid == NULL );
authzid = control;
break;
} else if ( strcasecmp( control, "manageDSAit" ) == 0 ) {
if( manageDSAit ) {
fprintf( stderr, "manageDSAit control previously specified\n");
@ -249,8 +248,7 @@ main(int argc, char **argv)
}
manageDSAit = 1 + crit;
break;
} else if ( strcasecmp( control, "noop" ) == 0 ) {
if( noop ) {
fprintf( stderr, "noop control previously specified\n");
@ -263,13 +261,13 @@ main(int argc, char **argv)
}
noop = 1 + crit;
break;
} else {
fprintf( stderr, "Invalid general control name: %s\n", control );
usage(prog);
return EXIT_FAILURE;
}
break;
case 'h': /* ldap host */
if( ldapuri != NULL ) {
fprintf( stderr, "%s: -h incompatible with -H\n", prog );
@ -425,7 +423,8 @@ main(int argc, char **argv)
prog );
usage( prog );
return( EXIT_FAILURE );
} break;
}
break;
case 'Q':
#ifdef HAVE_CYRUS_SASL
if( version == LDAP_VERSION2 ) {

View File

@ -235,8 +235,7 @@ main( int argc, char *argv[] )
assert( authzid == NULL );
authzid = control;
break;
} else if ( strcasecmp( control, "manageDSAit" ) == 0 ) {
if( manageDSAit ) {
fprintf( stderr, "manageDSAit control previously specified\n");
@ -249,8 +248,7 @@ main( int argc, char *argv[] )
}
manageDSAit = 1 + crit;
break;
} else if ( strcasecmp( control, "noop" ) == 0 ) {
if( cvalue != NULL ) {
fprintf( stderr, "noop: no control value expected\n" );
@ -259,13 +257,13 @@ main( int argc, char *argv[] )
}
noop = 1 + crit;
break;
} else {
fprintf( stderr, "Invalid general control name: %s\n", control );
usage(prog);
return EXIT_FAILURE;
}
break;
case 'h': /* ldap host */
if( ldapuri != NULL ) {
fprintf( stderr, "%s: -h incompatible with -H\n", prog );
@ -421,7 +419,8 @@ main( int argc, char *argv[] )
prog );
usage( prog );
return( EXIT_FAILURE );
} break;
}
break;
case 'Q':
#ifdef HAVE_CYRUS_SASL
if( version == LDAP_VERSION2 ) {

View File

@ -472,8 +472,7 @@ main( int argc, char **argv )
assert( authzid == NULL );
authzid = control;
break;
} else if ( strcasecmp( control, "manageDSAit" ) == 0 ) {
if( manageDSAit ) {
fprintf( stderr, "manageDSAit control previously specified");
@ -486,8 +485,7 @@ main( int argc, char **argv )
}
manageDSAit = 1 + crit;
break;
} else if ( strcasecmp( control, "noop" ) == 0 ) {
if( noop ) {
fprintf( stderr, "noop control previously specified");
@ -500,13 +498,13 @@ main( int argc, char **argv )
}
noop = 1 + crit;
break;
} else {
fprintf( stderr, "Invalid general control name: %s\n", control );
usage(prog);
return EXIT_FAILURE;
}
break;
case 'h': /* ldap host */
if( ldapuri != NULL ) {
fprintf( stderr, "%s: -h incompatible with -H\n", prog );
@ -662,7 +660,8 @@ main( int argc, char **argv )
prog );
usage( prog );
return( EXIT_FAILURE );
} break;
}
break;
case 'Q':
#ifdef HAVE_CYRUS_SASL
if( version == LDAP_VERSION2 ) {

View File

@ -191,8 +191,7 @@ main( int argc, char *argv[] )
assert( authzid == NULL );
authzid = control;
break;
} else if ( strcasecmp( control, "manageDSAit" ) == 0 ) {
if( manageDSAit ) {
fprintf( stderr, "manageDSAit control previously specified\n");
@ -205,8 +204,7 @@ main( int argc, char *argv[] )
}
manageDSAit = 1 + crit;
break;
} else if ( strcasecmp( control, "noop" ) == 0 ) {
if( noop ) {
fprintf( stderr, "noop control previously specified\n");
@ -219,13 +217,13 @@ main( int argc, char *argv[] )
}
noop = 1 + crit;
break;
} else {
fprintf( stderr, "Invalid general control name: %s\n", control );
usage(prog);
return EXIT_FAILURE;
}
break;
case 'h': /* ldap host */
if( ldapuri != NULL ) {
fprintf( stderr, "%s: -h incompatible with -H\n", prog );
@ -371,7 +369,8 @@ main( int argc, char *argv[] )
prog );
usage( prog );
return( EXIT_FAILURE );
} break;
}
break;
case 'Q':
#ifdef HAVE_CYRUS_SASL
if( version == LDAP_VERSION2 ) {