Remove duplicate or commented-out #includes

[deliverable/binutils-gdb.git] / gdb / mi / mi-cmd-target.c

diff --git a/gdb/mi/mi-cmd-target.c b/gdb/mi/mi-cmd-target.c
index 4d33bba4ac41e390d526de8d733f42a2c0fb48cd..7f77b98506a06f154d1acba23e251cf9ebfd45f5 100644 (file)
--- a/gdb/mi/mi-cmd-target.c
+++ b/gdb/mi/mi-cmd-target.c
@@ -1,5 +1,5 @@
 /* MI Command Set - target commands.
-   Copyright (C) 2007 Free Software Foundation, Inc.
+   Copyright (C) 2007-2019 Free Software Foundation, Inc.
 
    This file is part of GDB.
 
@@ -23,78 +23,72 @@
 
 /* Get a file from the target.  */
 
-enum mi_cmd_result
-mi_cmd_target_file_get (char *command, char **argv, int argc)
+void
+mi_cmd_target_file_get (const char *command, char **argv, int argc)
 {
-  int optind = 0;
-  char *optarg;
+  int oind = 0;
+  char *oarg;
   const char *remote_file, *local_file;
-  static struct mi_opt opts[] =
-  {
-    { 0, 0, 0 }
-  };
-  static const char *prefix = "mi_cmd_target_file_get";
+  static const struct mi_opt opts[] =
+    {
+      { 0, 0, 0 }
+    };
+  static const char prefix[] = "-target-file-get";
 
-  if (mi_getopt (prefix, argc, argv, opts, &optind, &optarg) != -1
-      || optind != argc - 2)
-    error (_("mi_cmd_target_file_get: Usage: REMOTE_FILE LOCAL_FILE"));
+  if (mi_getopt (prefix, argc, argv, opts, &oind, &oarg) != -1
+      || oind != argc - 2)
+    error (_("-target-file-get: Usage: REMOTE_FILE LOCAL_FILE"));
 
-  remote_file = argv[optind];
-  local_file = argv[optind + 1];
+  remote_file = argv[oind];
+  local_file = argv[oind + 1];
 
   remote_file_get (remote_file, local_file, 0);
-
-  return MI_CMD_DONE;
 }
 
 /* Send a file to the target.  */
 
-enum mi_cmd_result
-mi_cmd_target_file_put (char *command, char **argv, int argc)
+void
+mi_cmd_target_file_put (const char *command, char **argv, int argc)
 {
-  int optind = 0;
-  char *optarg;
+  int oind = 0;
+  char *oarg;
   const char *remote_file, *local_file;
-  static struct mi_opt opts[] =
-  {
-    { 0, 0, 0 }
-  };
-  static const char *prefix = "mi_cmd_target_file_put";
+  static const struct mi_opt opts[] =
+    {
+      { 0, 0, 0 }
+    };
+  static const char prefix[] = "-target-file-put";
 
-  if (mi_getopt (prefix, argc, argv, opts, &optind, &optarg) != -1
-      || optind != argc - 2)
-    error (_("mi_cmd_target_file_put: Usage: LOCAL_FILE REMOTE_FILE"));
+  if (mi_getopt (prefix, argc, argv, opts, &oind, &oarg) != -1
+      || oind != argc - 2)
+    error (_("-target-file-put: Usage: LOCAL_FILE REMOTE_FILE"));
 
-  local_file = argv[optind];
-  remote_file = argv[optind + 1];
+  local_file = argv[oind];
+  remote_file = argv[oind + 1];
 
   remote_file_put (local_file, remote_file, 0);
-
-  return MI_CMD_DONE;
 }
 
 /* Delete a file on the target.  */
 
-enum mi_cmd_result
-mi_cmd_target_file_delete (char *command, char **argv, int argc)
+void
+mi_cmd_target_file_delete (const char *command, char **argv, int argc)
 {
-  int optind = 0;
-  char *optarg;
-  const char *remote_file, *local_file;
-  static struct mi_opt opts[] =
-  {
-    { 0, 0, 0 }
-  };
-  static const char *prefix = "mi_cmd_target_file_delete";
+  int oind = 0;
+  char *oarg;
+  const char *remote_file;
+  static const struct mi_opt opts[] =
+    {
+      { 0, 0, 0 }
+    };
+  static const char prefix[] = "-target-file-delete";
 
-  if (mi_getopt (prefix, argc, argv, opts, &optind, &optarg) != -1
-      || optind != argc - 1)
-    error (_("mi_cmd_target_file_delete: Usage: REMOTE_FILE"));
+  if (mi_getopt (prefix, argc, argv, opts, &oind, &oarg) != -1
+      || oind != argc - 1)
+    error (_("-target-file-delete: Usage: REMOTE_FILE"));
 
-  remote_file = argv[optind];
+  remote_file = argv[oind];
 
   remote_file_delete (remote_file, 0);
-
-  return MI_CMD_DONE;
 }