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

added comments, made minor changes to error handling, changed a buffer type from char to uint8

Browse Source 
git-svn-id: file:///srv/svn/repos/haiku/trunk/current@2346 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
Matthew Wilber
2003-01-02 02:31:49 +00:00
parent b91e07e73a
commit d390baeede
1 changed files with 8 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/add-ons/translators/stxttranslator/STXTTranslator.cpp
+8 -3
View File
@@ -291,7 +291,8 @@ STXTTranslator::OutputFormats(int32 *out_count) const
// Returns: B_OK, if the data appears to be in the STXT format, // Returns: B_OK, if the data appears to be in the STXT format,
// B_NO_TRANSLATOR, if the data is not in the STXT format or // B_NO_TRANSLATOR, if the data is not in the STXT format or
// returns B_ERROR if errors were encountered in trying to // returns B_ERROR if errors were encountered in trying to
// determine the format // determine the format, or another error code if there was an
// error calling BPostionIO::Read()
// --------------------------------------------------------------- // ---------------------------------------------------------------
status_t status_t
identify_stxt_header(const TranslatorStyledTextStreamHeader &header, identify_stxt_header(const TranslatorStyledTextStreamHeader &header,
@@ -301,7 +302,7 @@ identify_stxt_header(const TranslatorStyledTextStreamHeader &header,
const ssize_t ktxtsize = sizeof(TranslatorStyledTextTextHeader); const ssize_t ktxtsize = sizeof(TranslatorStyledTextTextHeader);
const ssize_t kstylsize = sizeof(TranslatorStyledTextStyleHeader); const ssize_t kstylsize = sizeof(TranslatorStyledTextStyleHeader);
char buffer[max(ktxtsize, kstylsize)]; uint8 buffer[max(ktxtsize, kstylsize)];
// Check the TEXT header // Check the TEXT header
TranslatorStyledTextTextHeader txtheader; TranslatorStyledTextTextHeader txtheader;
@@ -335,6 +336,8 @@ identify_stxt_header(const TranslatorStyledTextStreamHeader &header,
ssize_t read = 0; ssize_t read = 0;
TranslatorStyledTextStyleHeader stylheader; TranslatorStyledTextStyleHeader stylheader;
read = inSource->Read(buffer, kstylsize); read = inSource->Read(buffer, kstylsize);
if (read < 0)
return read;
if (read != kstylsize && read != 0) if (read != kstylsize && read != 0)
return B_NO_TRANSLATOR; return B_NO_TRANSLATOR;
@@ -477,6 +480,8 @@ identify_txt_header(uint8 *data, int32 nread,
// //
// B_OK, if this translator understand the data and there were // B_OK, if this translator understand the data and there were
// no errors found // no errors found
//
// Other errors if BPositionIO::Read() returned an error value
// --------------------------------------------------------------- // ---------------------------------------------------------------
status_t status_t
STXTTranslator::Identify(BPositionIO *inSource, STXTTranslator::Identify(BPositionIO *inSource,
@@ -538,7 +543,7 @@ STXTTranslator::Identify(BPositionIO *inSource,
// //
// Postconditions: // Postconditions:
// //
// Returns: B_BAD_VALUE, if the options in ioExtension are bad // Returns: B_BAD_VALUE, if outType is invalid
// //
// B_NO_TRANSLATOR, if this translator doesn't understand the data // B_NO_TRANSLATOR, if this translator doesn't understand the data
// //