Fix latent bug with custom word point completers

[deliverable/binutils-gdb.git] / gdb / f-valprint.c

diff --git a/gdb/f-valprint.c b/gdb/f-valprint.c
index 5f9dd4dedb8453ce2a6b66bf5a3271ba1304d5c1..264416ec5408e1c763ad40b21af7c8966d854a6d 100644 (file)
--- a/gdb/f-valprint.c
+++ b/gdb/f-valprint.c
@@ -199,7 +199,7 @@ static const struct generic_val_print_decorations f_decorations =
   ")",
   ".TRUE.",
   ".FALSE.",
-  "VOID",
+  "void",
   "{",
   "}"
 };
@@ -407,17 +407,17 @@ info_common_command_for_block (const struct block *block, const char *comname,
            printf_filtered ("%s = ",
                             SYMBOL_PRINT_NAME (common->contents[index]));
 
-           TRY
+           try
              {
                val = value_of_variable (common->contents[index], block);
                value_print (val, gdb_stdout, &opts);
              }
 
-           CATCH (except, RETURN_MASK_ERROR)
+           catch (const gdb_exception_error &except)
              {
-               printf_filtered ("<error reading variable: %s>", except.message);
+               printf_filtered ("<error reading variable: %s>",
+                                except.what ());
              }
-           END_CATCH
 
            putchar_filtered ('\n');
          }