avoid shadowing

git-svn-id: svn://svn.h5l.se/heimdal/trunk/heimdal@15486 ec53bebd-3082-4978-b11e-865c3cabbd6b
This commit is contained in:
Love Hörnquist Åstrand
2005-06-17 05:27:46 +00:00
parent 04dcbbc45a
commit 1a8b054bbc

View File

@@ -384,13 +384,6 @@ static struct getargs args[] = {
static int num_args = sizeof(args) / sizeof(args[0]); static int num_args = sizeof(args) / sizeof(args[0]);
static void
usage (int code, struct getargs *args, int num_args)
{
arg_printusage (args, num_args, NULL, "master");
exit (code);
}
int int
main(int argc, char **argv) main(int argc, char **argv)
{ {
@@ -405,13 +398,12 @@ main(int argc, char **argv)
krb5_principal server; krb5_principal server;
char **files; char **files;
int optind;
const char *master; const char *master;
optind = krb5_program_setup(&context, argc, argv, args, num_args, usage); krb5_program_setup(&context, argc, argv, args, num_args, NULL);
if(help_flag) if(help_flag)
usage (0, args, num_args); krb5_std_usage(0, args, num_args);
if(version_flag) { if(version_flag) {
print_version(NULL); print_version(NULL);
exit(0); exit(0);
@@ -433,7 +425,7 @@ main(int argc, char **argv)
argv += optind; argv += optind;
if (argc != 1) if (argc != 1)
usage (1, args, num_args); krb5_std_usage(1, args, num_args);
master = argv[0]; master = argv[0];
@@ -492,7 +484,6 @@ main(int argc, char **argv)
server_context->log_context.version); server_context->log_context.version);
for (;;) { for (;;) {
int ret;
krb5_data out; krb5_data out;
krb5_storage *sp; krb5_storage *sp;
int32_t tmp; int32_t tmp;