Teach -data-list-register-values to not include unavailable registers

[deliverable/binutils-gdb.git] / gdb / mi / mi-getopt.c

diff --git a/gdb/mi/mi-getopt.c b/gdb/mi/mi-getopt.c
index 78301e37499a186047faad8935ccef8f47075ee7..a1e2ccc58746d1e1a2f26e441c3f82c4f39510bd 100644 (file)
--- a/gdb/mi/mi-getopt.c
+++ b/gdb/mi/mi-getopt.c
@@ -1,6 +1,5 @@
 /* MI Command Set - MI Option Parser.
-   Copyright (C) 2000, 2001, 2007, 2008, 2009, 2010
-   Free Software Foundation, Inc.
+   Copyright (C) 2000-2013 Free Software Foundation, Inc.
    Contributed by Cygnus Solutions (a Red Hat company).
 
    This file is part of GDB.
@@ -25,49 +24,50 @@
 int
 mi_getopt (const char *prefix,
           int argc, char **argv,
-          struct mi_opt *opts,
-          int *optind, char **optarg)
+          const struct mi_opt *opts,
+          int *oind, char **oarg)
 {
   char *arg;
-  struct mi_opt *opt;
-  /* We assume that argv/argc are ok. */
-  if (*optind > argc || *optind < 0)
+  const struct mi_opt *opt;
+
+  /* We assume that argv/argc are ok.  */
+  if (*oind > argc || *oind < 0)
     internal_error (__FILE__, __LINE__,
-                   _("mi_getopt_long: optind out of bounds"));
-  if (*optind == argc)
+                   _("mi_getopt_long: oind out of bounds"));
+  if (*oind == argc)
     return -1;
-  arg = argv[*optind];
+  arg = argv[*oind];
   /* ``--''? */
   if (strcmp (arg, "--") == 0)
     {
-      *optind += 1;
-      *optarg = NULL;
+      *oind += 1;
+      *oarg = NULL;
       return -1;
     }
-  /* End of option list. */
+  /* End of option list.  */
   if (arg[0] != '-')
     {
-      *optarg = NULL;
+      *oarg = NULL;
       return -1;
     }
-  /* Look the option up. */
+  /* Look the option up.  */
   for (opt = opts; opt->name != NULL; opt++)
     {
       if (strcmp (opt->name, arg + 1) != 0)
        continue;
       if (opt->arg_p)
        {
-         /* A non-simple optarg option. */
-         if (argc < *optind + 2)
+         /* A non-simple oarg option.  */
+         if (argc < *oind + 2)
            error (_("%s: Option %s requires an argument"), prefix, arg);
-         *optarg = argv[(*optind) + 1];
-         *optind = (*optind) + 2;
+         *oarg = argv[(*oind) + 1];
+         *oind = (*oind) + 2;
          return opt->index;
        }
       else
        {
-         *optarg = NULL;
-         *optind = (*optind) + 1;
+         *oarg = NULL;
+         *oind = (*oind) + 1;
          return opt->index;
        }
     }
@@ -77,14 +77,14 @@ mi_getopt (const char *prefix,
 int 
 mi_valid_noargs (const char *prefix, int argc, char **argv) 
 {
-  int optind = 0;
-  char *optarg;
-  static struct mi_opt opts[] =
-  {
-    { 0, 0, 0 }
-  };
+  int oind = 0;
+  char *oarg;
+  static const struct mi_opt opts[] =
+    {
+      { 0, 0, 0 }
+    };
 
-  if (mi_getopt (prefix, argc, argv, opts, &optind, &optarg) == -1)
+  if (mi_getopt (prefix, argc, argv, opts, &oind, &oarg) == -1)
     return 1;
   else
     return 0;