merge from gcc

[deliverable/binutils-gdb.git] / gdb / remote-rdp.c

diff --git a/gdb/remote-rdp.c b/gdb/remote-rdp.c
index 20683110232a7236ebca7ccc0fa9b8fb585d293a..2a60f28fadaf505267086e487e16cd48a172446a 100644 (file)
--- a/gdb/remote-rdp.c
+++ b/gdb/remote-rdp.c
@@ -193,7 +193,7 @@ get_byte (void)
       if (timeout == 0)
        return (unsigned char) c;
 
-      error ("Timeout reading from remote_system");
+      error (_("Timeout reading from remote_system"));
     }
 
   return c;
@@ -387,7 +387,7 @@ rdp_init (int cold, int tty)
 
   if (!sync)
     {
-      error ("Couldn't reset the board, try pressing the reset button");
+      error (_("Couldn't reset the board, try pressing the reset button"));
     }
 }
 
@@ -454,10 +454,10 @@ send_rdp (char *template,...)
              printf_unfiltered ("RDP: Unimplemented message\n");
              return;
            case 255:
-             error ("Command garbled");
+             error (_("Command garbled"));
              break;
            default:
-             error ("Corrupt reply from target");
+             error (_("Corrupt reply from target"));
              break;
            }
          break;
@@ -495,13 +495,13 @@ send_rdp (char *template,...)
          *pi = get_byte ();
          break;
        default:
-         internal_error (__FILE__, __LINE__, "failed internal consistency check");
+         internal_error (__FILE__, __LINE__, _("failed internal consistency check"));
        }
     }
   va_end (alist);
 
   if (dst != buf)
-    internal_error (__FILE__, __LINE__, "failed internal consistency check");
+    internal_error (__FILE__, __LINE__, _("failed internal consistency check"));
 }
 
 
@@ -988,7 +988,7 @@ handle_swi (void)
          break;
 
        default:
-         error ("Unimplemented SWI argument");
+         error (_("Unimplemented SWI argument"));
        }
 
       type = type >> 2;
@@ -1126,7 +1126,7 @@ remote_rdp_open (char *args, int from_tty)
   int not_icebreaker;
 
   if (!args)
-    error_no_arg ("serial port device name");
+    error_no_arg (_("serial port device name"));
 
   baud_rate = 9600;
 
@@ -1181,7 +1181,7 @@ remote_rdp_open (char *args, int from_tty)
   flush_cached_frames ();
   registers_changed ();
   stop_pc = read_pc ();
-  print_stack_frame (get_selected_frame (), 0, SRC_AND_LOC);
+  print_stack_frame (get_selected_frame (NULL), 0, SRC_AND_LOC);
 }
 
 
@@ -1357,7 +1357,7 @@ remote_rdp_create_inferior (char *exec_file, char *allargs, char **env,
   CORE_ADDR entry_point;
 
   if (exec_file == 0 || exec_bfd == 0)
-    error ("No executable file specified.");
+    error (_("No executable file specified."));
 
   entry_point = (CORE_ADDR) bfd_get_start_address (exec_bfd);
 
@@ -1405,7 +1405,7 @@ init_remote_rdp_ops (void)
   remote_rdp_ops.to_fetch_registers = remote_rdp_fetch_register;
   remote_rdp_ops.to_store_registers = remote_rdp_store_register;
   remote_rdp_ops.to_prepare_to_store = remote_rdp_prepare_to_store;
-  remote_rdp_ops.to_xfer_memory = remote_rdp_xfer_inferior_memory;
+  remote_rdp_ops.deprecated_xfer_memory = remote_rdp_xfer_inferior_memory;
   remote_rdp_ops.to_files_info = remote_rdp_files_info;
   remote_rdp_ops.to_insert_breakpoint = remote_rdp_insert_breakpoint;
   remote_rdp_ops.to_remove_breakpoint = remote_rdp_remove_breakpoint;