i2p/haiku-beta6
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Cast errors to status_t before throwing, otherwise the catch operator

Browse Source 
won't catch them (as ints). Thanks to Ingo and Marcus for pointing out 
the problem and suggesting a solution.


git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@21133 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
Stefano Ceccherini
2007-05-13 20:26:31 +00:00
parent 8528239c6e
commit 84c2abee94
1 changed files with 6 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/kits/interface/PictureDataWriter.cpp
+6 -4
View File
@@ -15,6 +15,8 @@
#include <stdio.h> #include <stdio.h>
#define THROW_ERROR(error) throw (status_t)(error)
PictureDataWriter::PictureDataWriter() PictureDataWriter::PictureDataWriter()
: :
fData(NULL) fData(NULL)
@@ -450,7 +452,7 @@ void
PictureDataWriter::BeginOp(const int16 &op) PictureDataWriter::BeginOp(const int16 &op)
{ {
if (fData == NULL) if (fData == NULL)
throw B_NO_INIT; THROW_ERROR(B_NO_INIT);
fStack.push(fData->Position()); fStack.push(fData->Position());
fData->Write(&op, sizeof(op)); fData->Write(&op, sizeof(op));
@@ -465,7 +467,7 @@ void
PictureDataWriter::EndOp() PictureDataWriter::EndOp()
{ {
if (fData == NULL) if (fData == NULL)
throw B_NO_INIT; THROW_ERROR(B_NO_INIT);
off_t curPos = fData->Position(); off_t curPos = fData->Position();
off_t stackPos = fStack.top(); off_t stackPos = fStack.top();
@@ -489,7 +491,7 @@ PictureDataWriter::WriteData(const void *data, size_t size)
{ {
ssize_t result = fData->Write(data, size); ssize_t result = fData->Write(data, size);
if (result < 0) if (result < 0)
throw (status_t)result; THROW_ERROR(result);
if (result != size) if (result != size)
throw B_IO_ERROR; THROW_ERROR(B_IO_ERROR);
} }