mirror/taglib
1
0
Fork 0
mirror of https://github.com/taglib/taglib.git synced 2026-04-06 06:02:44 -04:00
Code Issues Packages Projects Releases Wiki Activity

Fix uses of ulong where 32-bit integers are expected

Browse Source
This commit is contained in:
Tsuda Kageyu
2013-03-22 11:17:10 +09:00
parent 914e5f9fd8
commit cd082cd8e3
8 changed files with 74 additions and 48 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
taglib/mod/modfilebase.cpp
View File

@ -33,14 +33,14 @@ Mod::FileBase::FileBase(IOStream *stream) : TagLib::File(stream)
{
}
void Mod::FileBase::writeString(const String &s, ulong size, char padding)
void Mod::FileBase::writeString(const String &s, uint size, char padding)
{
ByteVector data(s.data(String::Latin1));
data.resize(size, padding);
writeBlock(data);
}
bool Mod::FileBase::readString(String &s, ulong size)
bool Mod::FileBase::readString(String &s, uint size)
{
ByteVector data(readBlock(size));
if(data.size() < size) return false;
@ -66,7 +66,7 @@ void Mod::FileBase::writeU16L(ushort number)
writeBlock(ByteVector::fromShort(number, false));
}
void Mod::FileBase::writeU32L(ulong number)
void Mod::FileBase::writeU32L(uint number)
{
writeBlock(ByteVector::fromUInt(number, false));
}
@ -76,7 +76,7 @@ void Mod::FileBase::writeU16B(ushort number)
writeBlock(ByteVector::fromShort(number, true));
}
void Mod::FileBase::writeU32B(ulong number)
void Mod::FileBase::writeU32B(uint number)
{
writeBlock(ByteVector::fromUInt(number, true));
}
@ -97,7 +97,7 @@ bool Mod::FileBase::readU16L(ushort &number)
return true;
}
bool Mod::FileBase::readU32L(ulong &number) {
bool Mod::FileBase::readU32L(uint &number) {
ByteVector data(readBlock(4));
if(data.size() < 4) return false;
number = data.toUInt(false);
@ -112,7 +112,7 @@ bool Mod::FileBase::readU16B(ushort &number)
return true;
}
bool Mod::FileBase::readU32B(ulong &number) {
bool Mod::FileBase::readU32B(uint &number) {
ByteVector data(readBlock(4));
if(data.size() < 4) return false;
number = data.toUInt(true);

12
taglib/mod/modfilebase.h
View File

@ -40,19 +40,19 @@ namespace TagLib {
FileBase(FileName file);
FileBase(IOStream *stream);
void writeString(const String &s, ulong size, char padding = 0);
void writeString(const String &s, uint size, char padding = 0);
void writeByte(uchar byte);
void writeU16L(ushort number);
void writeU32L(ulong number);
void writeU32L(uint number);
void writeU16B(ushort number);
void writeU32B(ulong number);
void writeU32B(uint number);
bool readString(String &s, ulong size);
bool readString(String &s, uint size);
bool readByte(uchar &byte);
bool readU16L(ushort &number);
bool readU32L(ulong &number);
bool readU32L(uint &number);
bool readU16B(ushort &number);
bool readU32B(ulong &number);
bool readU32B(uint &number);
};
}

12
taglib/mod/modfileprivate.h
View File

@ -37,11 +37,11 @@
setter(number); \
}
#define READ_BYTE(setter) READ(setter,uchar,readByte)
#define READ_BYTE(setter) READ(setter,uchar, readByte)
#define READ_U16L(setter) READ(setter,ushort,readU16L)
#define READ_U32L(setter) READ(setter,ulong,readU32L)
#define READ_U32L(setter) READ(setter,uint, readU32L)
#define READ_U16B(setter) READ(setter,ushort,readU16B)
#define READ_U32B(setter) READ(setter,ulong,readU32B)
#define READ_U32B(setter) READ(setter,uint, readU32B)
#define READ_STRING(setter,size) \
{ \
@ -54,11 +54,11 @@
type name = 0; \
READ_ASSERT(read(name));
#define READ_BYTE_AS(name) READ_AS(uchar,name,readByte)
#define READ_BYTE_AS(name) READ_AS(uchar, name,readByte)
#define READ_U16L_AS(name) READ_AS(ushort,name,readU16L)
#define READ_U32L_AS(name) READ_AS(ulong,name,readU32L)
#define READ_U32L_AS(name) READ_AS(uint, name,readU32L)
#define READ_U16B_AS(name) READ_AS(ushort,name,readU16B)
#define READ_U32B_AS(name) READ_AS(ulong,name,readU32B)
#define READ_U32B_AS(name) READ_AS(uint, name,readU32B)
#define READ_STRING_AS(name,size) \
String name; \