* ada-lang.c (ada_index_type): Update comment.

[deliverable/binutils-gdb.git] / gdb / wrapper.c

diff --git a/gdb/wrapper.c b/gdb/wrapper.c
index 39f8eaa44abe743f74c8b9ed3ebc3ccc8b970e28..931ecbf8105809e1deda1bbe722f7943d6f5e5be 100644 (file)
--- a/gdb/wrapper.c
+++ b/gdb/wrapper.c
@@ -1,10 +1,11 @@
 /* Longjump free calls to GDB internal routines.
 
-   Copyright 1999, 2000, 2005 Free Software Foundation, Inc.
+   Copyright (C) 1999, 2000, 2005, 2007, 2008, 2009
+   Free Software Foundation, Inc.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; either version 2 of the License, or
+   the Free Software Foundation; either version 3 of the License, or
    (at your option) any later version.
 
    This program is distributed in the hope that it will be useful,
@@ -13,9 +14,7 @@
    GNU General Public License for more details.
 
    You should have received a copy of the GNU General Public License
-   along with this program; if not, write to the Free Software
-   Foundation, Inc., 59 Temple Place - Suite 330,
-   Boston, MA 02111-1307, USA.  */
+   along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
 #include "defs.h"
 #include "value.h"
@@ -27,7 +26,7 @@ int
 gdb_parse_exp_1 (char **stringptr, struct block *block, int comma,
                 struct expression **expression)
 {
-  volatile struct exception except;
+  volatile struct gdb_exception except;
 
   TRY_CATCH (except, RETURN_MASK_ERROR)
     {
@@ -42,7 +41,7 @@ gdb_parse_exp_1 (char **stringptr, struct block *block, int comma,
 int
 gdb_evaluate_expression (struct expression *exp, struct value **value)
 {
-  volatile struct exception except;
+  volatile struct gdb_exception except;
 
   TRY_CATCH (except, RETURN_MASK_ERROR)
     {
@@ -57,7 +56,7 @@ gdb_evaluate_expression (struct expression *exp, struct value **value)
 int
 gdb_value_fetch_lazy (struct value *val)
 {
-  volatile struct exception except;
+  volatile struct gdb_exception except;
 
   TRY_CATCH (except, RETURN_MASK_ERROR)
     {
@@ -72,7 +71,7 @@ gdb_value_fetch_lazy (struct value *val)
 int
 gdb_value_equal (struct value *val1, struct value *val2, int *result)
 {
-  volatile struct exception except;
+  volatile struct gdb_exception except;
 
   TRY_CATCH (except, RETURN_MASK_ERROR)
     {
@@ -88,7 +87,7 @@ int
 gdb_value_assign (struct value *val1, struct value *val2,
                  struct value **result)
 {
-  volatile struct exception except;
+  volatile struct gdb_exception except;
 
   TRY_CATCH (except, RETURN_MASK_ERROR)
     {
@@ -101,14 +100,14 @@ gdb_value_assign (struct value *val1, struct value *val2,
 }
 
 int
-gdb_value_subscript (struct value *val1, struct value *val2,
+gdb_value_subscript (struct value *val, LONGEST index,
                     struct value **result)
 {
-  volatile struct exception except;
+  volatile struct gdb_exception except;
 
   TRY_CATCH (except, RETURN_MASK_ERROR)
     {
-      *result = value_subscript (val1, val2);
+      *result = value_subscript (val, index);
     }
 
   if (except.reason < 0)
@@ -119,7 +118,7 @@ gdb_value_subscript (struct value *val1, struct value *val2,
 int
 gdb_value_ind (struct value *val, struct value **result)
 {
-  volatile struct exception except;
+  volatile struct gdb_exception except;
 
   TRY_CATCH (except, RETURN_MASK_ERROR)
     {
@@ -134,7 +133,7 @@ gdb_value_ind (struct value *val, struct value **result)
 int
 gdb_parse_and_eval_type (char *p, int length, struct type **type)
 {
-  volatile struct exception except;
+  volatile struct gdb_exception except;
 
   TRY_CATCH (except, RETURN_MASK_ERROR)
     {
@@ -151,9 +150,9 @@ gdb_value_struct_elt (struct ui_out *uiout, struct value **result,
                      struct value **argp, struct value **args, char *name,
                      int *static_memfuncp, char *err)
 {
-  volatile struct exception except;
+  volatile struct gdb_exception except;
 
-  TRY_CATCH (except, RETURN_MASK_ALL)
+  TRY_CATCH (except, RETURN_MASK_ERROR)
     {
       *result = value_struct_elt (argp, args, name, static_memfuncp, err);
     }