diff options
Diffstat (limited to 'libs')
-rw-r--r-- | libs/taglib/taglib/mpeg/id3v1/id3v1tag.cpp | 3 | ||||
-rw-r--r-- | libs/taglib/taglib/mpeg/id3v2/id3v2tag.cpp | 3 | ||||
-rw-r--r-- | libs/taglib/taglib/ogg/flac/oggflacfile.cpp | 3 | ||||
-rw-r--r-- | libs/taglib/taglib/ogg/oggpage.cpp | 6 | ||||
-rw-r--r-- | libs/taglib/taglib/ogg/speex/speexproperties.cpp | 6 | ||||
-rw-r--r-- | libs/taglib/taglib/ogg/vorbis/vorbisproperties.cpp | 6 | ||||
-rw-r--r-- | libs/taglib/taglib/toolkit/tfile.cpp | 3 | ||||
-rw-r--r-- | libs/taglib/taglib/toolkit/tstring.cpp | 6 |
8 files changed, 24 insertions, 12 deletions
diff --git a/libs/taglib/taglib/mpeg/id3v1/id3v1tag.cpp b/libs/taglib/taglib/mpeg/id3v1/id3v1tag.cpp index 490f8ddaf4..f698865b15 100644 --- a/libs/taglib/taglib/mpeg/id3v1/id3v1tag.cpp +++ b/libs/taglib/taglib/mpeg/id3v1/id3v1tag.cpp @@ -207,8 +207,9 @@ void ID3v1::Tag::read() // some initial sanity checking if(data.size() == 128 && data.startsWith("TAG")) parse(data); - else + else { debug("ID3v1 tag is not valid or could not be read at the specified offset."); + } } } diff --git a/libs/taglib/taglib/mpeg/id3v2/id3v2tag.cpp b/libs/taglib/taglib/mpeg/id3v2/id3v2tag.cpp index beb496c8a0..1e9eb3f83f 100644 --- a/libs/taglib/taglib/mpeg/id3v2/id3v2tag.cpp +++ b/libs/taglib/taglib/mpeg/id3v2/id3v2tag.cpp @@ -431,8 +431,9 @@ void ID3v2::Tag::parse(const ByteVector &origData) // portion of the frame data. if(data.at(frameDataPosition) == 0) { - if(d->header.footerPresent()) + if(d->header.footerPresent()) { debug("Padding *and* a footer found. This is not allowed by the spec."); + } d->paddingSize = frameDataLength - frameDataPosition; return; diff --git a/libs/taglib/taglib/ogg/flac/oggflacfile.cpp b/libs/taglib/taglib/ogg/flac/oggflacfile.cpp index 3070f3ab14..9281fbaf1d 100644 --- a/libs/taglib/taglib/ogg/flac/oggflacfile.cpp +++ b/libs/taglib/taglib/ogg/flac/oggflacfile.cpp @@ -256,8 +256,9 @@ void Ogg::FLAC::File::scan() d->hasXiphComment = true; d->commentPacket = ipacket; } - else if(blockType > 5) + else if(blockType > 5) { debug("Ogg::FLAC::File::scan() -- Unknown metadata block"); + } } diff --git a/libs/taglib/taglib/ogg/oggpage.cpp b/libs/taglib/taglib/ogg/oggpage.cpp index 0b82828467..da231a143b 100644 --- a/libs/taglib/taglib/ogg/oggpage.cpp +++ b/libs/taglib/taglib/ogg/oggpage.cpp @@ -151,8 +151,9 @@ ByteVectorList Ogg::Page::packets() const for(; it != packetSizes.end(); ++it) l.append(d->file->readBlock(*it)); } - else + else { debug("Ogg::Page::packets() -- attempting to read packets from an invalid page."); + } return l; } @@ -173,8 +174,9 @@ ByteVector Ogg::Page::render() const d->file->seek(d->packetOffset); data.append(d->file->readBlock(d->dataSize)); } - else + else { debug("Ogg::Page::render() -- this page is empty!"); + } } else { ByteVectorList::ConstIterator it = d->packets.begin(); diff --git a/libs/taglib/taglib/ogg/speex/speexproperties.cpp b/libs/taglib/taglib/ogg/speex/speexproperties.cpp index 29deb019c1..9790325175 100644 --- a/libs/taglib/taglib/ogg/speex/speexproperties.cpp +++ b/libs/taglib/taglib/ogg/speex/speexproperties.cpp @@ -161,10 +161,12 @@ void Speex::Properties::read() if(start >= 0 && end >= 0 && d->sampleRate > 0) d->length = (int) ((end - start) / (long long) d->sampleRate); - else + else { debug("Speex::Properties::read() -- Either the PCM values for the start or " "end of this file was incorrect or the sample rate is zero."); + } } - else + else { debug("Speex::Properties::read() -- Could not find valid first and last Ogg pages."); + } } diff --git a/libs/taglib/taglib/ogg/vorbis/vorbisproperties.cpp b/libs/taglib/taglib/ogg/vorbis/vorbisproperties.cpp index c82a3191f3..492a0fdccb 100644 --- a/libs/taglib/taglib/ogg/vorbis/vorbisproperties.cpp +++ b/libs/taglib/taglib/ogg/vorbis/vorbisproperties.cpp @@ -174,10 +174,12 @@ void Vorbis::Properties::read() if(start >= 0 && end >= 0 && d->sampleRate > 0) d->length = (end - start) / (long long) d->sampleRate; - else + else { debug("Vorbis::Properties::read() -- Either the PCM values for the start or " "end of this file was incorrect or the sample rate is zero."); + } } - else + else { debug("Vorbis::Properties::read() -- Could not find valid first and last Ogg pages."); + } } diff --git a/libs/taglib/taglib/toolkit/tfile.cpp b/libs/taglib/taglib/toolkit/tfile.cpp index 7090a64199..f63a06612a 100644 --- a/libs/taglib/taglib/toolkit/tfile.cpp +++ b/libs/taglib/taglib/toolkit/tfile.cpp @@ -114,8 +114,9 @@ File::FilePrivate::FilePrivate(FileName fileName) : else file = fopen(name, "rb"); - if(!file) + if(!file) { debug("Could not open file " + String((const char *) name)); + } } //////////////////////////////////////////////////////////////////////////////// diff --git a/libs/taglib/taglib/toolkit/tstring.cpp b/libs/taglib/taglib/toolkit/tstring.cpp index ffb706f70a..6611e7cdca 100644 --- a/libs/taglib/taglib/toolkit/tstring.cpp +++ b/libs/taglib/taglib/toolkit/tstring.cpp @@ -232,8 +232,9 @@ std::string String::to8Bit(bool unicode) const &target, targetBuffer + outputBufferSize, Unicode::lenientConversion); - if(result != Unicode::conversionOK) + if(result != Unicode::conversionOK) { debug("String::to8Bit() - Unicode conversion error."); + } int newSize = target - targetBuffer; s.resize(newSize); @@ -728,8 +729,9 @@ void String::prepare(Type t) &target, targetBuffer + bufferSize, Unicode::lenientConversion); - if(result != Unicode::conversionOK) + if(result != Unicode::conversionOK) { debug("String::prepare() - Unicode conversion error."); + } int newSize = target != targetBuffer ? target - targetBuffer - 1 : 0; |