X-Git-Url: http://drtracing.org/?a=blobdiff_plain;ds=sidebyside;f=gdb%2Ff-valprint.c;h=e730f379b1170d295f2c07729adb87d9ea8edd74;hb=b607efe7149f91512dc5fd9dbfc4c6156cdf9a93;hp=2b2d47b2b4dfae7ff7e5068362464430052a4b56;hpb=6c9638b444fd6ebdd189fe05c3e44dfbc95c878c;p=deliverable%2Fbinutils-gdb.git

diff --git a/gdb/f-valprint.c b/gdb/f-valprint.c
index 2b2d47b2b4..e730f379b1 100644
--- a/gdb/f-valprint.c
+++ b/gdb/f-valprint.c
@@ -33,9 +33,20 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
 #include "gdbcore.h"
 #include "command.h"
 
-extern unsigned int print_max; /* No of array elements to print */ 
-
-extern int calc_f77_array_dims PARAMS ((struct type *));
+#if 0
+static int there_is_a_visible_common_named PARAMS ((char *));
+#endif
+
+static void info_common_command PARAMS ((char *, int));
+static void list_all_visible_commons PARAMS ((char *));
+static void f77_print_array PARAMS ((struct type *, char *, CORE_ADDR,
+				     FILE *, int, int, int,
+				     enum val_prettyprint));
+static void f77_print_array_1 PARAMS ((int, int, struct type *, char *,
+				       CORE_ADDR, FILE *, int, int, int,
+				       enum val_prettyprint));
+static void f77_create_arrayprint_offset_tbl PARAMS ((struct type *, FILE *));
+static void f77_get_dynamic_length_of_aggregate PARAMS ((struct type *));
 
 int f77_array_offset_tbl[MAX_FORTRAN_DIMS+1][2];
 
@@ -178,7 +189,7 @@ f77_get_dynamic_upperbound (type, upper_bound)
 
 /* Obtain F77 adjustable array dimensions */ 
 
-void
+static void
 f77_get_dynamic_length_of_aggregate (type)
      struct type *type;
 {
@@ -211,13 +222,13 @@ f77_get_dynamic_length_of_aggregate (type)
   /* Patch in a valid length value. */ 
   
   TYPE_LENGTH (type) =
-    (upper_bound - lower_bound + 1) * TYPE_LENGTH (TYPE_TARGET_TYPE (type));
+    (upper_bound - lower_bound + 1) * TYPE_LENGTH (check_typedef (TYPE_TARGET_TYPE (type)));
 }       
 
 /* Function that sets up the array offset,size table for the array 
    type "type".  */ 
 
-void 
+static void 
 f77_create_arrayprint_offset_tbl (type, stream)
      struct type *type;
      FILE *stream;
@@ -266,13 +277,13 @@ f77_create_arrayprint_offset_tbl (type, stream)
 /* Actual function which prints out F77 arrays, Valaddr == address in 
    the superior.  Address == the address in the inferior.  */
 
-void 
+static void 
 f77_print_array_1 (nss, ndimensions, type, valaddr, address, 
 		   stream, format, deref_ref, recurse, pretty)
      int nss;
      int ndimensions; 
-     char *valaddr;
      struct type *type;
+     char *valaddr;
      CORE_ADDR address;
      FILE *stream;
      int format;
@@ -290,7 +301,7 @@ f77_print_array_1 (nss, ndimensions, type, valaddr, address,
 	  f77_print_array_1 (nss + 1, ndimensions, TYPE_TARGET_TYPE (type),
 			    valaddr + i * F77_DIM_OFFSET (nss),
 			    address + i * F77_DIM_OFFSET (nss), 
-			    stream, format, deref_ref, recurse, pretty, i);
+			    stream, format, deref_ref, recurse, pretty);
 	  fprintf_filtered (stream, ") ");
 	}
     }
@@ -315,7 +326,7 @@ f77_print_array_1 (nss, ndimensions, type, valaddr, address,
 /* This function gets called to print an F77 array, we set up some 
    stuff and then immediately call f77_print_array_1() */
 
-void 
+static void 
 f77_print_array (type, valaddr, address, stream, format, deref_ref, recurse, 
 		 pretty)
      struct type *type;
@@ -376,6 +387,7 @@ f_val_print (type, valaddr, address, stream, format, deref_ref, recurse,
   LONGEST val;
   CORE_ADDR addr;
   
+  CHECK_TYPEDEF (type);
   switch (TYPE_CODE (type))
     {
     case TYPE_CODE_STRING: 
@@ -403,7 +415,7 @@ f_val_print (type, valaddr, address, stream, format, deref_ref, recurse,
       else
 	{
 	  addr = unpack_pointer (type, valaddr);
-	  elttype = TYPE_TARGET_TYPE (type);
+	  elttype = check_typedef (TYPE_TARGET_TYPE (type));
 	  
 	  if (TYPE_CODE (elttype) == TYPE_CODE_FUNC)
 	    {
@@ -560,7 +572,7 @@ f_val_print (type, valaddr, address, stream, format, deref_ref, recurse,
   return 0;
 }
 
-void
+static void
 list_all_visible_commons (funname)
      char *funname;
 {
@@ -679,7 +691,8 @@ info_common_command (comname, from_tty)
 /* This function is used to determine whether there is a
    F77 common block visible at the current scope called 'comname'. */ 
 
-int
+#if 0
+static int
 there_is_a_visible_common_named (comname)
      char *comname;
 {
@@ -738,6 +751,7 @@ there_is_a_visible_common_named (comname)
   
   return (the_common ? 1 : 0);
 }
+#endif
 
 void
 _initialize_f_valprint ()