summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authoroharboe <oharboe@b42882b7-edfa-0310-969c-e2dbd0fdcd60>2008-04-24 20:40:52 +0000
committeroharboe <oharboe@b42882b7-edfa-0310-969c-e2dbd0fdcd60>2008-04-24 20:40:52 +0000
commit9334cd451b299afe46703c59d13297ca48b684a4 (patch)
tree262a6d7a4f9d1a0162e6d33feca3fe07ff194e0e /src
parent040e25424314b49e35eb158eb88e287c76e50596 (diff)
downloadopenocd+libswd-9334cd451b299afe46703c59d13297ca48b684a4.tar.gz
openocd+libswd-9334cd451b299afe46703c59d13297ca48b684a4.tar.bz2
openocd+libswd-9334cd451b299afe46703c59d13297ca48b684a4.tar.xz
openocd+libswd-9334cd451b299afe46703c59d13297ca48b684a4.zip
Close dangling file handle
git-svn-id: svn://svn.berlios.de/openocd/trunk@616 b42882b7-edfa-0310-969c-e2dbd0fdcd60
Diffstat (limited to 'src')
-rw-r--r--src/flash/flash.c2
-rw-r--r--src/target/image.c16
2 files changed, 11 insertions, 7 deletions
diff --git a/src/flash/flash.c b/src/flash/flash.c
index b9e5a9dc..3478b6a2 100644
--- a/src/flash/flash.c
+++ b/src/flash/flash.c
@@ -478,7 +478,7 @@ int handle_flash_erase_address_command(struct command_context_s *cmd_ctx, char *
p = get_flash_bank_by_addr(target, address);
if (p == NULL)
{
- return ERROR_COMMAND_SYNTAX_ERROR;
+ return ERROR_FAIL;
}
/* We can't know if we did a resume + halt, in which case we no longer know the erased state */
diff --git a/src/target/image.c b/src/target/image.c
index 1eb95672..72a3828c 100644
--- a/src/target/image.c
+++ b/src/target/image.c
@@ -57,15 +57,19 @@ static int autodetect_image_type(image_t *image, char *url)
{
return retval;
}
- if ((retval = fileio_read(&fileio, 9, buffer, &read_bytes)) != ERROR_OK)
- {
- return ERROR_FILEIO_OPERATION_FAILED;
- }
- if (read_bytes != 9)
+ retval = fileio_read(&fileio, 9, buffer, &read_bytes);
+
+ if (retval==ERROR_OK)
{
- return ERROR_FILEIO_OPERATION_FAILED;
+ if (read_bytes != 9)
+ {
+ retval=ERROR_FILEIO_OPERATION_FAILED;
+ }
}
fileio_close(&fileio);
+
+ if (retval!=ERROR_OK)
+ return retval;
/* check header against known signatures */
if (strncmp((char*)buffer,ELFMAG,SELFMAG)==0)