]> git.ipfire.org Git - thirdparty/binutils-gdb.git/commitdiff
Warning fixes.
authorDaniel Jacobowitz <drow@false.org>
Wed, 3 Jan 2007 19:01:25 +0000 (19:01 +0000)
committerDaniel Jacobowitz <drow@false.org>
Wed, 3 Jan 2007 19:01:25 +0000 (19:01 +0000)
* ada-lang.c (find_struct_field): Initialize *byte_offset_p.
* breakpoint.c (do_enable_breakpoint): Ignore both mem_cnt and i.
* c-typeprint.c (c_type_print_varspec_suffix): Don't test length
greater than or equal to zero.
* m2-typeprint.c (m2_array): Likewise.
* p-typeprint.c (pascal_type_print_varspec_prefix): Likewise.
* gdbtypes.c (copy_type_recursive): Correct == typo.
* i386-tdep.c (i386_skip_prologue): Remove stray semicolon.
* linux-nat.c (linux_nat_info_proc_cmd): Don't compare a pointer
greater than zero.
* macroscope.c (sal_macro_scope): Don't name a local variable "main".
(default_macro_scope): Remove unused variable.
* prologue-value.h (pv_area_find_reg): Don't name an argument
"register".
* remote-fileio.c (remote_fio_func_map): Add missing braces.
* remote.c (sigint_remote_twice_token, sigint_remote_token): Change
type.
(cleanup_sigint_signal_handler): Remove casts.
* valprint.c (val_print): Use a volatile local for the modified
argument.
* varobj.c (languages): Remove extra array dimension.
(varobj_create): Correct access to languages array.
* mi/mi-cmd-break.c (mi_cmd_break_insert, mi_cmd_break_watch): Add
missing braces.
* mi/mi-cmd-disas.c (mi_cmd_disassemble): Likewise.
* mi/mi-cmd-env.c (mi_cmd_env_path, mi_cmd_env_dir): Likewise.
* mi/mi-getopt.c (mi_valid_noargs): Likewise.
* mi/mi-main.c (mi_cmd_data_read_memory): Likewise.
(mi_cmd_data_write_memory): Likewise.
* signals/signals.c (target_signal_to_string): Cast to int before
comparing.
* tui/tui-layout.c (init_and_make_win): Take and return a void *.
Update all callers.

22 files changed:
gdb/ChangeLog
gdb/ada-lang.c
gdb/breakpoint.c
gdb/c-typeprint.c
gdb/gdbtypes.c
gdb/i386-tdep.c
gdb/linux-nat.c
gdb/m2-typeprint.c
gdb/macroscope.c
gdb/mi/mi-cmd-break.c
gdb/mi/mi-cmd-disas.c
gdb/mi/mi-cmd-env.c
gdb/mi/mi-getopt.c
gdb/mi/mi-main.c
gdb/p-typeprint.c
gdb/prologue-value.h
gdb/remote-fileio.c
gdb/remote.c
gdb/signals/signals.c
gdb/tui/tui-layout.c
gdb/valprint.c
gdb/varobj.c

index cd956b62d0506e7a2b92ba8289b06a3fd9300b31..299c61f2dfcfd27d5b05c801b9586ff946bf5507 100644 (file)
@@ -1,3 +1,39 @@
+2007-01-03  Daniel Jacobowitz  <dan@codesourcery.com>
+
+       * ada-lang.c (find_struct_field): Initialize *byte_offset_p.
+       * breakpoint.c (do_enable_breakpoint): Ignore both mem_cnt and i.
+       * c-typeprint.c (c_type_print_varspec_suffix): Don't test length
+       greater than or equal to zero.
+       * m2-typeprint.c (m2_array): Likewise.
+       * p-typeprint.c (pascal_type_print_varspec_prefix): Likewise.
+       * gdbtypes.c (copy_type_recursive): Correct == typo.
+       * i386-tdep.c (i386_skip_prologue): Remove stray semicolon.
+       * linux-nat.c (linux_nat_info_proc_cmd): Don't compare a pointer
+       greater than zero.
+       * macroscope.c (sal_macro_scope): Don't name a local variable "main".
+       (default_macro_scope): Remove unused variable.
+       * prologue-value.h (pv_area_find_reg): Don't name an argument
+       "register".
+       * remote-fileio.c (remote_fio_func_map): Add missing braces.
+       * remote.c (sigint_remote_twice_token, sigint_remote_token): Change
+       type.
+       (cleanup_sigint_signal_handler): Remove casts.
+       * valprint.c (val_print): Use a volatile local for the modified
+       argument.
+       * varobj.c (languages): Remove extra array dimension.
+       (varobj_create): Correct access to languages array.
+       * mi/mi-cmd-break.c (mi_cmd_break_insert, mi_cmd_break_watch): Add
+       missing braces.
+       * mi/mi-cmd-disas.c (mi_cmd_disassemble): Likewise.
+       * mi/mi-cmd-env.c (mi_cmd_env_path, mi_cmd_env_dir): Likewise.
+       * mi/mi-getopt.c (mi_valid_noargs): Likewise.
+       * mi/mi-main.c (mi_cmd_data_read_memory): Likewise.
+       (mi_cmd_data_write_memory): Likewise.
+       * signals/signals.c (target_signal_to_string): Cast to int before
+       comparing.
+       * tui/tui-layout.c (init_and_make_win): Take and return a void *.
+       Update all callers.
+
 2007-01-03  Daniel Jacobowitz  <dan@codesourcery.com>
 
        * NEWS: Mention pointer to member improvements.
index 7de7a191520205ba573b808e9083fcab6c2db33c..76968d9b421a4ed298dc1e7c6113ea93db31aa60 100644 (file)
@@ -5628,7 +5628,7 @@ find_struct_field (char *name, struct type *type, int offset,
   if (field_type_p != NULL)
     *field_type_p = NULL;
   if (byte_offset_p != NULL)
-    *byte_offset_p;
+    *byte_offset_p = 0;
   if (bit_offset_p != NULL)
     *bit_offset_p = 0;
   if (bit_size_p != NULL)
index be858e21f357350bdef4883c3ad7fe069d31f51a..9101750c95cee34136794d24b7e8c3e0dfda98ea 100644 (file)
@@ -7599,7 +7599,7 @@ is valid is not currently in scope.\n"), bpt->number);
              int mem_cnt = can_use_hardware_watchpoint (bpt->val);
              
              /* Hack around 'unused var' error for some targets here */
-             (void) mem_cnt, i;
+             (void) mem_cnt, (void) i;
              target_resources_ok = TARGET_CAN_USE_HARDWARE_WATCHPOINT (
                                                                        bpt->type, i + mem_cnt, other_type_used);
              /* we can consider of type is bp_hardware_watchpoint, convert to 
index 518af681efb34a1309b3b909e3753bc39ccac3f7..4e1c71317a9c4d09438da9720655b02e01691e48 100644 (file)
@@ -542,7 +542,7 @@ c_type_print_varspec_suffix (struct type *type, struct ui_file *stream,
        fprintf_filtered (stream, ")");
 
       fprintf_filtered (stream, "[");
-      if (TYPE_LENGTH (type) >= 0 && TYPE_LENGTH (TYPE_TARGET_TYPE (type)) > 0
+      if (TYPE_LENGTH (TYPE_TARGET_TYPE (type)) > 0
        && TYPE_ARRAY_UPPER_BOUND_TYPE (type) != BOUND_CANNOT_BE_DETERMINED)
        fprintf_filtered (stream, "%d",
                          (TYPE_LENGTH (type)
index 308e6c21a748409211338e5b90a2919ec5972728..8c33edb9c29240fb652e29d81da68918be55ce41 100644 (file)
@@ -3305,7 +3305,7 @@ copy_type_recursive (struct objfile *objfile, struct type *type,
      can't, but at the moment it is not needed.  */
 
   if (TYPE_CODE (type) == TYPE_CODE_FLT)
-    TYPE_FLOATFORMAT (new_type) == TYPE_FLOATFORMAT (type);
+    TYPE_FLOATFORMAT (new_type) = TYPE_FLOATFORMAT (type);
   else if (TYPE_CODE (type) == TYPE_CODE_STRUCT
           || TYPE_CODE (type) == TYPE_CODE_UNION
           || TYPE_CODE (type) == TYPE_CODE_TEMPLATE
index 705e3f32887fc140871acb3d2897a1aad347289a..cd52bf6d0783df52672f10b9f873fbecdcbca5a8 100644 (file)
@@ -886,7 +886,7 @@ i386_skip_prologue (CORE_ADDR start_pc)
 
       /* addl y,%ebx */
       if (delta > 0 && op == 0x81
-         && read_memory_unsigned_integer (pc + delta + 1, 1) == 0xc3);
+         && read_memory_unsigned_integer (pc + delta + 1, 1) == 0xc3)
        {
          pc += delta + 6;
        }
index c0e6dc1a51c82af81509ce2ce6dd88013b61c740..fedb1796304df5262a564ceb3792c87da94d2e70 100644 (file)
@@ -2804,7 +2804,7 @@ linux_nat_info_proc_cmd (char *args, int from_tty)
   if (cmdline_f || all)
     {
       sprintf (fname1, "/proc/%lld/cmdline", pid);
-      if ((procfile = fopen (fname1, "r")) > 0)
+      if ((procfile = fopen (fname1, "r")) != NULL)
        {
          fgets (buffer, sizeof (buffer), procfile);
          printf_filtered ("cmdline = '%s'\n", buffer);
@@ -2834,7 +2834,7 @@ linux_nat_info_proc_cmd (char *args, int from_tty)
   if (mappings_f || all)
     {
       sprintf (fname1, "/proc/%lld/maps", pid);
-      if ((procfile = fopen (fname1, "r")) > 0)
+      if ((procfile = fopen (fname1, "r")) != NULL)
        {
          long long addr, endaddr, size, offset, inode;
          char permissions[8], device[8], filename[MAXPATHLEN];
@@ -2894,7 +2894,7 @@ linux_nat_info_proc_cmd (char *args, int from_tty)
   if (status_f || all)
     {
       sprintf (fname1, "/proc/%lld/status", pid);
-      if ((procfile = fopen (fname1, "r")) > 0)
+      if ((procfile = fopen (fname1, "r")) != NULL)
        {
          while (fgets (buffer, sizeof (buffer), procfile) != NULL)
            puts_filtered (buffer);
@@ -2906,7 +2906,7 @@ linux_nat_info_proc_cmd (char *args, int from_tty)
   if (stat_f || all)
     {
       sprintf (fname1, "/proc/%lld/stat", pid);
-      if ((procfile = fopen (fname1, "r")) > 0)
+      if ((procfile = fopen (fname1, "r")) != NULL)
        {
          int itmp;
          char ctmp;
index cda9189e023d705c2b7a76cd291d03725a0532be..1f26438b90221c1aa398bff5cd39dce52a806c49 100644 (file)
@@ -206,7 +206,7 @@ static void m2_array (struct type *type, struct ui_file *stream,
                      int show, int level)
 {
   fprintf_filtered (stream, "ARRAY [");
-  if (TYPE_LENGTH (type) >= 0 && TYPE_LENGTH (TYPE_TARGET_TYPE (type)) > 0
+  if (TYPE_LENGTH (TYPE_TARGET_TYPE (type)) > 0
       && TYPE_ARRAY_UPPER_BOUND_TYPE (type) != BOUND_CANNOT_BE_DETERMINED)
     {
       if (TYPE_INDEX_TYPE (type) != 0)
index 748ac53600843ca17d506df60578186197685ef1..25860d4159b104b0f91510a274a113fada2d3fcb 100644 (file)
@@ -33,7 +33,7 @@
 struct macro_scope *
 sal_macro_scope (struct symtab_and_line sal)
 {
-  struct macro_source_file *main, *inclusion;
+  struct macro_source_file *main_file, *inclusion;
   struct macro_scope *ms;
 
   if (! sal.symtab
@@ -42,8 +42,8 @@ sal_macro_scope (struct symtab_and_line sal)
 
   ms = (struct macro_scope *) xmalloc (sizeof (*ms));
 
-  main = macro_main (sal.symtab->macro_table);
-  inclusion = macro_lookup_inclusion (main, sal.symtab->filename);
+  main_file = macro_main (sal.symtab->macro_table);
+  inclusion = macro_lookup_inclusion (main_file, sal.symtab->filename);
 
   if (inclusion)
     {
@@ -66,7 +66,7 @@ sal_macro_scope (struct symtab_and_line sal)
 
          For the time being, though, we'll just treat these as
          occurring at the end of the main source file.  */
-      ms->file = main;
+      ms->file = main_file;
       ms->line = -1;
 
       complaint (&symfile_complaints,
@@ -83,7 +83,6 @@ struct macro_scope *
 default_macro_scope (void)
 {
   struct symtab_and_line sal;
-  struct macro_source_file *main;
   struct macro_scope *ms;
 
   /* If there's a selected frame, use its PC.  */ 
index 84318b93f86404566de96e7aa5bab9d2f05957da..3e0fa80d128ed3f2ffcb78e25bce48c44949467f 100644 (file)
@@ -90,7 +90,7 @@ mi_cmd_break_insert (char *command, char **argv, int argc)
     {"c", CONDITION_OPT, 1},
     {"i", IGNORE_COUNT_OPT, 1},
     {"p", THREAD_OPT, 1},
-    0
+    { 0, 0, 0 }
   };
 
   /* Parse arguments. It could be -r or -h or -t, <location> or ``--''
@@ -196,7 +196,7 @@ mi_cmd_break_watch (char *command, char **argv, int argc)
   {
     {"r", READ_OPT, 0},
     {"a", ACCESS_OPT, 0},
-    0
+    { 0, 0, 0 }
   };
 
   /* Parse arguments. */
index 7b003a6abd56862c3043e8aeef408b7485766988..0cc67e4949bc927570e9c4e248979b128eac279f 100644 (file)
@@ -84,7 +84,7 @@ mi_cmd_disassemble (char *command, char **argv, int argc)
     {"n", NUM_OPT, 1},
     {"s", START_OPT, 1},
     {"e", END_OPT, 1},
-    0
+    { 0, 0, 0 }
   };
 
   /* Get the options with their arguments. Keep track of what we
index 101aa3c72eb7837986c93bef46fe82995eb884b0..f14051c3f7f101ba30cbcda695fbc3b1ed8d1a06 100644 (file)
@@ -126,7 +126,7 @@ mi_cmd_env_path (char *command, char **argv, int argc)
   static struct mi_opt opts[] =
   {
     {"r", RESET_OPT, 0},
-    0
+    { 0, 0, 0 }
   };
 
   dont_repeat ();
@@ -198,7 +198,7 @@ mi_cmd_env_dir (char *command, char **argv, int argc)
   static struct mi_opt opts[] =
   {
     {"r", RESET_OPT, 0},
-    0
+    { 0, 0, 0 }
   };
 
   dont_repeat ();
index 838a8e16640781fe84b9d35b8b160589aacf3651..6701e313e902fc6385574caf79a20bb3c2c2b033 100644 (file)
@@ -82,7 +82,7 @@ mi_valid_noargs (const char *prefix, int argc, char **argv)
   char *optarg;
   static struct mi_opt opts[] =
   {
-    0
+    { 0, 0, 0 }
   };
 
   if (mi_getopt (prefix, argc, argv, opts, &optind, &optarg) == -1)
index 98b7b6d86f546b940131ebb20edd73babf4a32c6..8338931f9426caee2578a7b4dfc4ae4046a446e8 100644 (file)
@@ -762,7 +762,7 @@ mi_cmd_data_read_memory (char *command, char **argv, int argc)
   static struct mi_opt opts[] =
   {
     {"o", OFFSET_OPT, 1},
-    0
+    { 0, 0, 0 }
   };
 
   while (1)
@@ -962,7 +962,7 @@ mi_cmd_data_write_memory (char *command, char **argv, int argc)
   static struct mi_opt opts[] =
   {
     {"o", OFFSET_OPT, 1},
-    0
+    { 0, 0, 0 }
   };
 
   while (1)
index d6f6b4ba13a38ef553e3e57b6536d95a51778705..4449c91cb6714bf84da6d9cf35b717e40695ad79 100644 (file)
@@ -252,7 +252,7 @@ pascal_type_print_varspec_prefix (struct type *type, struct ui_file *stream,
       if (passed_a_ptr)
        fprintf_filtered (stream, "(");
       fprintf_filtered (stream, "array ");
-      if (TYPE_LENGTH (type) >= 0 && TYPE_LENGTH (TYPE_TARGET_TYPE (type)) > 0
+      if (TYPE_LENGTH (TYPE_TARGET_TYPE (type)) > 0
        && TYPE_ARRAY_UPPER_BOUND_TYPE (type) != BOUND_CANNOT_BE_DETERMINED)
        fprintf_filtered (stream, "[%d..%d] ",
                          TYPE_ARRAY_LOWER_BOUND_VALUE (type),
index ec44cad021f052cf7a7bee034302ce6818c248e6..8df77b7ea1ce3676aa922672f1c8b443c3190526 100644 (file)
@@ -285,7 +285,7 @@ int pv_area_store_would_trash (struct pv_area *area, pv_t addr);
    instead, and collecting all your information in one pass.  */
 int pv_area_find_reg (struct pv_area *area,
                       struct gdbarch *gdbarch,
-                      int register,
+                      int reg,
                       CORE_ADDR *offset_p);
 
 
index eb7ae3829636c390ebcc9becbc18fd00d4136ebe..c698d76f69aa74c0539d44a41161daed1dd15334 100644 (file)
@@ -1332,19 +1332,19 @@ static struct {
   char *name;
   void (*func)(char *);
 } remote_fio_func_map[] = {
-  "open", remote_fileio_func_open,
-  "close", remote_fileio_func_close,
-  "read", remote_fileio_func_read,
-  "write", remote_fileio_func_write,
-  "lseek", remote_fileio_func_lseek,
-  "rename", remote_fileio_func_rename,
-  "unlink", remote_fileio_func_unlink,
-  "stat", remote_fileio_func_stat,
-  "fstat", remote_fileio_func_fstat,
-  "gettimeofday", remote_fileio_func_gettimeofday,
-  "isatty", remote_fileio_func_isatty,
-  "system", remote_fileio_func_system,
-  NULL, NULL
+  { "open", remote_fileio_func_open },
+  { "close", remote_fileio_func_close },
+  { "read", remote_fileio_func_read },
+  { "write", remote_fileio_func_write },
+  { "lseek", remote_fileio_func_lseek },
+  { "rename", remote_fileio_func_rename },
+  { "unlink", remote_fileio_func_unlink },
+  { "stat", remote_fileio_func_stat },
+  { "fstat", remote_fileio_func_fstat },
+  { "gettimeofday", remote_fileio_func_gettimeofday },
+  { "isatty", remote_fileio_func_isatty },
+  { "system", remote_fileio_func_system },
+  { NULL, NULL }
 };
 
 static int
index 69bc65bd16e5ab4844696293e2eede7cd331eb93..c46531079fe56007274091c373d15a346580837e 100644 (file)
@@ -996,8 +996,8 @@ static int use_threadinfo_query;
 static int use_threadextra_query;
 
 /* Tokens for use by the asynchronous signal handlers for SIGINT.  */
-static void *sigint_remote_twice_token;
-static void *sigint_remote_token;
+static struct async_signal_handler *sigint_remote_twice_token;
+static struct async_signal_handler *sigint_remote_token;
 
 /* These are pointers to hook functions that may be set in order to
    modify resume/wait behavior for a particular architecture.  */
@@ -2945,11 +2945,9 @@ cleanup_sigint_signal_handler (void *dummy)
 {
   signal (SIGINT, handle_sigint);
   if (sigint_remote_twice_token)
-    delete_async_signal_handler ((struct async_signal_handler **)
-                                &sigint_remote_twice_token);
+    delete_async_signal_handler (&sigint_remote_twice_token);
   if (sigint_remote_token)
-    delete_async_signal_handler ((struct async_signal_handler **)
-                                &sigint_remote_token);
+    delete_async_signal_handler (&sigint_remote_token);
 }
 
 /* Send ^C to target to halt it.  Target will respond, and send us a
index 63eb333c4870117e574da1f8b3b228075baff9d5..55ededc542c8dfe613733e144d2bbee4ee6750ce 100644 (file)
@@ -1,6 +1,6 @@
 /* Target signal translation functions for GDB.
    Copyright (C) 1990, 1991, 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
-   2000, 2001, 2002 Free Software Foundation, Inc.
+   2000, 2001, 2002, 2003, 2006 Free Software Foundation, Inc.
    Contributed by Cygnus Support.
 
    This file is part of GDB.
@@ -219,7 +219,7 @@ static struct {
 char *
 target_signal_to_string (enum target_signal sig)
 {
-  if ((sig >= TARGET_SIGNAL_FIRST) && (sig <= TARGET_SIGNAL_LAST))
+  if ((int) sig >= TARGET_SIGNAL_FIRST && (int) sig <= TARGET_SIGNAL_LAST)
     return signals[sig].string;
   else
     return signals[TARGET_SIGNAL_UNKNOWN].string;
@@ -229,7 +229,7 @@ target_signal_to_string (enum target_signal sig)
 char *
 target_signal_to_name (enum target_signal sig)
 {
-  if ((sig >= TARGET_SIGNAL_FIRST) && (sig <= TARGET_SIGNAL_LAST)
+  if ((int) sig >= TARGET_SIGNAL_FIRST && (int) sig <= TARGET_SIGNAL_LAST
       && signals[sig].name != NULL)
     return signals[sig].name;
   else
index 2690c49a4d9b89d214ed00ba402b0bd24ec13df7..37b70a1693a75352fb5cc7ff40516b92749f0184 100644 (file)
@@ -47,7 +47,7 @@
 ********************************/
 static void show_layout (enum tui_layout_type);
 static void init_gen_win_info (struct tui_gen_win_info *, enum tui_win_type, int, int, int, int);
-static void init_and_make_win (void **, enum tui_win_type, int, int, int, int, int);
+static void *init_and_make_win (void *, enum tui_win_type, int, int, int, int, int);
 static void show_source_or_disasm_and_command (enum tui_layout_type);
 static void make_source_or_disasm_window (struct tui_win_info * *, enum tui_win_type, int, int);
 static void make_command_window (struct tui_win_info * *, int, int);
@@ -640,13 +640,13 @@ prev_layout (void)
 static void
 make_command_window (struct tui_win_info * * win_info_ptr, int height, int origin_y)
 {
-  init_and_make_win ((void **) win_info_ptr,
-                  CMD_WIN,
-                  height,
-                  tui_term_width (),
-                  0,
-                  origin_y,
-                  DONT_BOX_WINDOW);
+  *win_info_ptr = init_and_make_win (*win_info_ptr,
+                                    CMD_WIN,
+                                    height,
+                                    tui_term_width (),
+                                    0,
+                                    origin_y,
+                                    DONT_BOX_WINDOW);
 
   (*win_info_ptr)->can_highlight = FALSE;
 }
@@ -679,13 +679,13 @@ make_disasm_window (struct tui_win_info * * win_info_ptr, int height, int origin
 static void
 make_data_window (struct tui_win_info * * win_info_ptr, int height, int origin_y)
 {
-  init_and_make_win ((void **) win_info_ptr,
-                  DATA_WIN,
-                  height,
-                  tui_term_width (),
-                  0,
-                  origin_y,
-                  BOX_WINDOW);
+  *win_info_ptr = init_and_make_win (*win_info_ptr,
+                                    DATA_WIN,
+                                    height,
+                                    tui_term_width (),
+                                    0,
+                                    origin_y,
+                                    BOX_WINDOW);
 }
 
 
@@ -751,13 +751,13 @@ show_source_disasm_command (void)
          if (TUI_DISASM_WIN == NULL)
            {
              make_disasm_window (&TUI_DISASM_WIN, asm_height, src_height - 1);
-             init_and_make_win ((void **) & locator,
-                              LOCATOR_WIN,
-                              2 /* 1 */ ,
-                              tui_term_width (),
-                              0,
-                              (src_height + asm_height) - 1,
-                              DONT_BOX_WINDOW);
+             locator = init_and_make_win (locator,
+                                          LOCATOR_WIN,
+                                          2 /* 1 */ ,
+                                          tui_term_width (),
+                                          0,
+                                          (src_height + asm_height) - 1,
+                                          DONT_BOX_WINDOW);
            }
          else
            {
@@ -844,13 +844,13 @@ show_data (enum tui_layout_type new_layout)
        make_source_window (&tui_win_list[win_type], src_height, data_height - 1);
       else
        make_disasm_window (&tui_win_list[win_type], src_height, data_height - 1);
-      init_and_make_win ((void **) & locator,
-                      LOCATOR_WIN,
-                      2 /* 1 */ ,
-                      tui_term_width (),
-                      0,
-                      total_height - 1,
-                      DONT_BOX_WINDOW);
+      locator = init_and_make_win (locator,
+                                  LOCATOR_WIN,
+                                  2 /* 1 */ ,
+                                  tui_term_width (),
+                                  0,
+                                  total_height - 1,
+                                  DONT_BOX_WINDOW);
     }
   else
     {
@@ -911,11 +911,11 @@ init_gen_win_info (struct tui_gen_win_info * win_info, enum tui_win_type type,
 /*
    ** init_and_make_win().
  */
-static void
-init_and_make_win (void ** win_info_ptr, enum tui_win_type win_type,
-                 int height, int width, int origin_x, int origin_y, int box_it)
+static void *
+init_and_make_win (void *opaque_win_info, enum tui_win_type win_type,
+                  int height, int width, int origin_x, int origin_y,
+                  int box_it)
 {
-  void *opaque_win_info = *win_info_ptr;
   struct tui_gen_win_info * generic;
 
   if (opaque_win_info == NULL)
@@ -942,7 +942,7 @@ init_and_make_win (void ** win_info_ptr, enum tui_win_type win_type,
        }
       tui_make_window (generic, box_it);
     }
-  *win_info_ptr = opaque_win_info;
+  return opaque_win_info;
 }
 
 
@@ -959,23 +959,23 @@ make_source_or_disasm_window (struct tui_win_info * * win_info_ptr, enum tui_win
     execution_info = tui_source_exec_info_win_ptr ();
   else
     execution_info = tui_disassem_exec_info_win_ptr ();
-  init_and_make_win ((void **) & execution_info,
-                  EXEC_INFO_WIN,
-                  height,
-                  3,
-                  0,
-                  origin_y,
-                  DONT_BOX_WINDOW);
+  execution_info = init_and_make_win (execution_info,
+                                     EXEC_INFO_WIN,
+                                     height,
+                                     3,
+                                     0,
+                                     origin_y,
+                                     DONT_BOX_WINDOW);
   /*
      ** Now create the source window.
    */
-  init_and_make_win ((void **) win_info_ptr,
-                  type,
-                  height,
-                  tui_term_width () - execution_info->width,
-                  execution_info->width,
-                  origin_y,
-                  BOX_WINDOW);
+  *win_info_ptr = init_and_make_win (*win_info_ptr,
+                                    type,
+                                    height,
+                                    tui_term_width () - execution_info->width,
+                                    execution_info->width,
+                                    origin_y,
+                                    BOX_WINDOW);
 
   (*win_info_ptr)->detail.source_info.execution_info = execution_info;
 }
@@ -1009,13 +1009,13 @@ show_source_or_disasm_and_command (enum tui_layout_type layout_type)
            make_source_window (win_info_ptr, src_height - 1, 0);
          else
            make_disasm_window (win_info_ptr, src_height - 1, 0);
-         init_and_make_win ((void **) & locator,
-                          LOCATOR_WIN,
-                          2 /* 1 */ ,
-                          tui_term_width (),
-                          0,
-                          src_height - 1,
-                          DONT_BOX_WINDOW);
+         locator = init_and_make_win (locator,
+                                      LOCATOR_WIN,
+                                      2 /* 1 */ ,
+                                      tui_term_width (),
+                                      0,
+                                      src_height - 1,
+                                      DONT_BOX_WINDOW);
        }
       else
        {
index 209414d67559af58fd539e202494dfdf15210a34..b50a65304b9b17b12d9f0da21cd96d6fd84d224f 100644 (file)
@@ -207,13 +207,12 @@ val_print (struct type *type, const gdb_byte *valaddr, int embedded_offset,
           int deref_ref, int recurse, enum val_prettyprint pretty)
 {
   volatile struct gdb_exception except;
+  volatile enum val_prettyprint real_pretty = pretty;
   int ret = 0;
 
   struct type *real_type = check_typedef (type);
   if (pretty == Val_pretty_default)
-    {
-      pretty = prettyprint_structs ? Val_prettyprint : Val_no_prettyprint;
-    }
+    real_pretty = prettyprint_structs ? Val_prettyprint : Val_no_prettyprint;
 
   QUIT;
 
@@ -231,7 +230,7 @@ val_print (struct type *type, const gdb_byte *valaddr, int embedded_offset,
   TRY_CATCH (except, RETURN_MASK_ERROR)
     {
       ret = LA_VAL_PRINT (type, valaddr, embedded_offset, address,
-                         stream, format, deref_ref, recurse, pretty);
+                         stream, format, deref_ref, recurse, real_pretty);
     }
   if (except.reason < 0)
     fprintf_filtered (stream, _("<error reading variable>"));
index 25860cbd502cf63b7dd554e6dd06fee7e1abfef2..a0ddacc019c6c1ce36975a7fc6b02e8fb4a413b5 100644 (file)
@@ -326,8 +326,7 @@ struct language_specific
 };
 
 /* Array of known source language routines. */
-static struct language_specific
-  languages[vlang_end][sizeof (struct language_specific)] = {
+static struct language_specific languages[vlang_end] = {
   /* Unknown (try treating as C */
   {
    vlang_unknown,
@@ -518,7 +517,7 @@ varobj_create (char *objname,
 
       /* Set language info */
       lang = variable_language (var);
-      var->root->lang = languages[lang];
+      var->root->lang = &languages[lang];
 
       /* Set ourselves as our root */
       var->root->rootvar = var;