2004-06-01 Andrew Cagney <cagney@gnu.org>

	* mi/mi-main.c (mi_cmd_data_read_memory): Add missing return for
	"invalid number of columns" error.  Delete redundant "out of
	memory" check.

diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index 7ad4f9764fbe7b10c92ff2a9563d0cd4c5948a12..f4931d7a3b9b1c793faedbd1d83d56c39fe7f156 100644 (file)
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,9 @@
+2004-06-01  Andrew Cagney  <cagney@gnu.org>
+
+       * mi/mi-main.c (mi_cmd_data_read_memory): Add missing return for
+       "invalid number of columns" error.  Delete redundant "out of
+       memory" check.
+
 2004-05-31  Mark Kettenis  <kettenis@gnu.org>
 
        * i386bsd-nat.c: Don't include <sys/procfs.h>.

diff --git a/gdb/mi/mi-main.c b/gdb/mi/mi-main.c
index 6d738618d6e8d59e6bd88ffa39f9da8f74c670bc..02ed6284152b38f566113f35e9ba978c4142fed6 100644 (file)
--- a/gdb/mi/mi-main.c
+++ b/gdb/mi/mi-main.c
@@ -886,6 +886,7 @@ mi_cmd_data_read_memory (char *command, char **argv, int argc)
     {
       xasprintf (&mi_error_message,
                 "mi_cmd_data_read_memory: invalid number of columns.");
+      return MI_CMD_ERROR;
     }
   /* The un-printable character when printing ascii. */
   if (argc == 6)
@@ -897,12 +898,6 @@ mi_cmd_data_read_memory (char *command, char **argv, int argc)
   total_bytes = word_size * nr_rows * nr_cols;
   mbuf = xcalloc (total_bytes, 1);
   make_cleanup (xfree, mbuf);
-  if (mbuf == NULL)
-    {
-      xasprintf (&mi_error_message,
-                "mi_cmd_data_read_memory: out of memory.");
-      return MI_CMD_ERROR;
-    }
   nr_bytes = 0;
   while (nr_bytes < total_bytes)
     {