s/optind/optidx/

git-svn-id: svn://svn.h5l.se/heimdal/trunk/heimdal@15541 ec53bebd-3082-4978-b11e-865c3cabbd6b

8 files changed, 30 insertions, 30 deletions

diff --git a/kuser/copy_cred_cache.c b/kuser/copy_cred_cache.c
index 590f1c057..d53912f09 100644
--- a/kuser/copy_cred_cache.c
+++ b/kuser/copy_cred_cache.c
@@ -113,7 +113,7 @@ main(int argc, char **argv)
 {
     krb5_error_code ret;
     krb5_context context;
-    int optind = 0;
+    int optidx = 0;
     const char *from_name, *to_name;
     krb5_ccache from_ccache, to_ccache;
     krb5_flags whichfields = 0;
@@ -124,7 +124,7 @@ main(int argc, char **argv)
 
     memset(&mcreds, 0, sizeof(mcreds));
 
-    if (getarg(args, sizeof(args) / sizeof(args[0]), argc, argv, &optind))
+    if (getarg(args, sizeof(args) / sizeof(args[0]), argc, argv, &optidx))
 	usage(1);
 
     if (help_flag)
@@ -134,8 +134,8 @@ main(int argc, char **argv)
 	print_version(NULL);
 	exit(0);
     }
-    argc -= optind;
-    argv += optind;
+    argc -= optidx;
+    argv += optidx;
 
     if (argc < 1 || argc > 2)
 	usage(1);
diff --git a/kuser/generate-requests.c b/kuser/generate-requests.c
index ecb85f86a..17485aa88 100644
--- a/kuser/generate-requests.c
+++ b/kuser/generate-requests.c
@@ -130,12 +130,12 @@ usage (int ret)
 int
 main(int argc, char **argv)
 {
-    int optind = 0;
+    int optidx = 0;
     int nreq;
     char *end;
 
     setprogname(argv[0]);
-    if(getarg(args, sizeof(args) / sizeof(args[0]), argc, argv, &optind))
+    if(getarg(args, sizeof(args) / sizeof(args[0]), argc, argv, &optidx))
 	usage(1);
 
     if (help_flag)
@@ -146,8 +146,8 @@ main(int argc, char **argv)
 	exit(0);
     }
 
-    argc -= optind;
-    argv += optind;
+    argc -= optidx;
+    argv += optidx;
 
     if (argc != 2)
 	usage (1);
diff --git a/kuser/kdecode_ticket.c b/kuser/kdecode_ticket.c
index e72c6e4ec..d5ea72aa0 100644
--- a/kuser/kdecode_ticket.c
+++ b/kuser/kdecode_ticket.c
@@ -101,7 +101,7 @@ main(int argc, char **argv)
     krb5_context context;
     krb5_ccache cache;
     krb5_creds in, *out;
-    int optind = 0;
+    int optidx = 0;
 
     setprogname (argv[0]);
 
@@ -109,7 +109,7 @@ main(int argc, char **argv)
     if (ret)
 	errx(1, "krb5_init_context failed: %d", ret);
   
-    if(getarg(args, sizeof(args) / sizeof(args[0]), argc, argv, &optind))
+    if(getarg(args, sizeof(args) / sizeof(args[0]), argc, argv, &optidx))
 	usage(1);
     
     if (help_flag)
@@ -120,8 +120,8 @@ main(int argc, char **argv)
 	exit(0);
     }
 
-    argc -= optind;
-    argv += optind;
+    argc -= optidx;
+    argv += optidx;
 
     if (argc != 1)
 	usage (1);
diff --git a/kuser/kdestroy.c b/kuser/kdestroy.c
index a61d871aa..ca3d30cf2 100644
--- a/kuser/kdestroy.c
+++ b/kuser/kdestroy.c
@@ -68,12 +68,12 @@ main (int argc, char **argv)
     krb5_error_code ret;
     krb5_context context;
     krb5_ccache  ccache;
-    int optind = 0;
+    int optidx = 0;
     int exit_val = 0;
 
     setprogname (argv[0]);
 
-    if(getarg(args, num_args, argc, argv, &optind))
+    if(getarg(args, num_args, argc, argv, &optidx))
 	usage(1);
   
     if (help_flag)
@@ -84,8 +84,8 @@ main (int argc, char **argv)
 	exit(0);
     }
   
-    argc -= optind;
-    argv += optind;
+    argc -= optidx;
+    argv += optidx;
 
     if (argc != 0)
 	usage (1);
diff --git a/kuser/kgetcred.c b/kuser/kgetcred.c
index f072a6ace..d5ee42c22 100644
--- a/kuser/kgetcred.c
+++ b/kuser/kgetcred.c
@@ -71,7 +71,7 @@ main(int argc, char **argv)
     krb5_ccache cache;
     krb5_creds in, *out;
     krb5_kdc_flags flags;
-    int optind = 0;
+    int optidx = 0;
 
     setprogname (argv[0]);
 
@@ -81,7 +81,7 @@ main(int argc, char **argv)
     if (ret)
 	errx(1, "krb5_init_context failed: %d", ret);
   
-    if(getarg(args, sizeof(args) / sizeof(args[0]), argc, argv, &optind))
+    if(getarg(args, sizeof(args) / sizeof(args[0]), argc, argv, &optidx))
 	usage(1);
     
     if (help_flag)
@@ -92,8 +92,8 @@ main(int argc, char **argv)
 	exit(0);
     }
 
-    argc -= optind;
-    argv += optind;
+    argc -= optidx;
+    argv += optidx;
 
     if (argc != 1)
 	usage (1);
diff --git a/kuser/kinit.c b/kuser/kinit.c
index 2de03ee22..d23ef4e11 100644
--- a/kuser/kinit.c
+++ b/kuser/kinit.c
@@ -712,7 +712,7 @@ main (int argc, char **argv)
     krb5_context context;
     krb5_ccache  ccache;
     krb5_principal principal;
-    int optind = 0;
+    int optidx = 0;
     krb5_deltat ticket_life = 0;
 
     setprogname (argv[0]);
@@ -723,7 +723,7 @@ main (int argc, char **argv)
     else if (ret)
 	errx(1, "krb5_init_context failed: %d", ret);
   
-    if(getarg(args, sizeof(args) / sizeof(args[0]), argc, argv, &optind))
+    if(getarg(args, sizeof(args) / sizeof(args[0]), argc, argv, &optidx))
 	usage(1);
     
     if (help_flag)
@@ -734,8 +734,8 @@ main (int argc, char **argv)
 	exit(0);
     }
 
-    argc -= optind;
-    argv += optind;
+    argc -= optidx;
+    argv += optidx;
 
     if (argv[0]) {
 	ret = krb5_parse_name (context, argv[0], &principal);
diff --git a/kuser/klist.c b/kuser/klist.c
index 5b39a012a..b0d4acc30 100644
--- a/kuser/klist.c
+++ b/kuser/klist.c
@@ -641,12 +641,12 @@ usage (int ret)
 int
 main (int argc, char **argv)
 {
-    int optind = 0;
+    int optidx = 0;
     int exit_status = 0;
 
     setprogname (argv[0]);
 
-    if(getarg(args, sizeof(args) / sizeof(args[0]), argc, argv, &optind))
+    if(getarg(args, sizeof(args) / sizeof(args[0]), argc, argv, &optidx))
 	usage(1);
     
     if (help_flag)
@@ -657,8 +657,8 @@ main (int argc, char **argv)
 	exit(0);
     }
 
-    argc -= optind;
-    argv += optind;
+    argc -= optidx;
+    argv += optidx;
 
     if (argc != 0)
 	usage (1);
diff --git a/kuser/kverify.c b/kuser/kverify.c
index e6c6d54a9..11d6b8398 100644
--- a/kuser/kverify.c
+++ b/kuser/kverify.c
@@ -62,11 +62,11 @@ main(int argc, char **argv)
     krb5_preauthtype pre_auth_types[] = {KRB5_PADATA_ENC_TIMESTAMP};
     krb5_get_init_creds_opt *get_options;
     krb5_verify_init_creds_opt verify_options;
-    int optind = 0;
+    int optidx = 0;
 
     setprogname (argv[0]);
 
-    if(getarg(args, sizeof(args) / sizeof(args[0]), argc, argv, &optind))
+    if(getarg(args, sizeof(args) / sizeof(args[0]), argc, argv, &optidx))
 	usage(1);
     
     if (help_flag)