Remove TARGET_XFER_STATUS_ERROR_P

This patch removes macro TARGET_XFER_STATUS_ERROR_P, as Pedro pointed
out during patches review that TARGET_XFER_STATUS_ERROR_P tends to
be unnecessary.

gdb:

2014-02-24  Yao Qi  <yao@codesourcery.com>

	* target.h (TARGET_XFER_STATUS_ERROR_P): Remove.
	* corefile.c (read_memory): Adjusted.
	* target.c (target_write_with_progress): Adjusted.
This commit is contained in:
Yao Qi 2014-02-23 12:24:08 +08:00
parent 605a662f6a
commit 5c328c057e
4 changed files with 11 additions and 13 deletions

View File

@ -1,3 +1,9 @@
2014-02-24 Yao Qi <yao@codesourcery.com>
* target.h (TARGET_XFER_STATUS_ERROR_P): Remove.
* corefile.c (read_memory): Adjusted.
* target.c (target_write_with_progress): Adjusted.
2014-02-23 Yao Qi <yao@codesourcery.com>
Revert two patches:

View File

@ -260,13 +260,10 @@ read_memory (CORE_ADDR memaddr, gdb_byte *myaddr, ssize_t len)
memaddr + xfered, len - xfered,
&xfered_len);
if (status == TARGET_XFER_EOF)
memory_error (TARGET_XFER_E_IO, memaddr + xfered);
if (status != TARGET_XFER_OK)
memory_error (status == TARGET_XFER_EOF ? TARGET_XFER_E_IO : status,
memaddr + xfered);
if (TARGET_XFER_STATUS_ERROR_P (status))
memory_error (status, memaddr + xfered);
gdb_assert (status == TARGET_XFER_OK);
xfered += xfered_len;
QUIT;
}

View File

@ -2002,12 +2002,9 @@ target_write_with_progress (struct target_ops *ops,
offset + xfered, len - xfered,
&xfered_len);
if (status == TARGET_XFER_EOF)
return xfered;
if (TARGET_XFER_STATUS_ERROR_P (status))
return -1;
if (status != TARGET_XFER_OK)
return status == TARGET_XFER_EOF ? xfered : -1;
gdb_assert (status == TARGET_XFER_OK);
if (progress)
(*progress) (xfered_len, baton);

View File

@ -225,8 +225,6 @@ enum target_xfer_status
/* Keep list in sync with target_xfer_error_to_string. */
};
#define TARGET_XFER_STATUS_ERROR_P(STATUS) ((STATUS) < TARGET_XFER_EOF)
/* Return the string form of ERR. */
extern const char *target_xfer_status_to_string (enum target_xfer_status err);