Refactor Cortex-A8 erratum workaround in preparation

[binutils-gdb.git] / gdb / completer.c

diff --git a/gdb/completer.c b/gdb/completer.c
index 821f882562365e40b66ef0e81dee89076a2035c5..5c3b3fcfaaeaa06acdb86aafe5987bc75c4dcc18 100644 (file)
--- a/gdb/completer.c
+++ b/gdb/completer.c
@@ -1,5 +1,5 @@
 /* Line completion stuff for GDB, the GNU debugger.
-   Copyright (C) 2000-2015 Free Software Foundation, Inc.
+   Copyright (C) 2000-2016 Free Software Foundation, Inc.
 
    This file is part of GDB.
 
@@ -165,14 +165,14 @@ filename_completer (struct cmd_list_element *ignore,
       else if (word > text)
        {
          /* Return some portion of p.  */
-         q = xmalloc (strlen (p) + 5);
+         q = (char *) xmalloc (strlen (p) + 5);
          strcpy (q, p + (word - text));
          xfree (p);
        }
       else
        {
          /* Return some of TEXT plus p.  */
-         q = xmalloc (strlen (p) + (text - word) + 5);
+         q = (char *) xmalloc (strlen (p) + (text - word) + 5);
          strncpy (q, word, text - word);
          q[text - word] = '\0';
          strcat (q, p);
@@ -985,7 +985,7 @@ new_completion_tracker (void)
 static void
 free_completion_tracker (void *p)
 {
-  completion_tracker_t *tracker_ptr = p;
+  completion_tracker_t *tracker_ptr = (completion_tracker_t *) p;
 
   htab_delete (*tracker_ptr);
   *tracker_ptr = NULL;
@@ -1149,11 +1149,12 @@ signal_completer (struct cmd_list_element *ignore,
 /* Bit-flags for selecting what the register and/or register-group
    completer should complete on.  */
 
-enum reg_completer_targets
+enum reg_completer_target
   {
     complete_register_names = 0x1,
     complete_reggroup_names = 0x2
   };
+DEF_ENUM_FLAGS_TYPE (enum reg_completer_target, reg_completer_targets);
 
 /* Complete register names and/or reggroup names based on the value passed
    in TARGETS.  At least one bit in TARGETS must be set.  */
@@ -1161,7 +1162,7 @@ enum reg_completer_targets
 static VEC (char_ptr) *
 reg_or_group_completer_1 (struct cmd_list_element *ignore,
                          const char *text, const char *word,
-                         enum reg_completer_targets targets)
+                         reg_completer_targets targets)
 {
   VEC (char_ptr) *result = NULL;
   size_t len = strlen (word);