Aren
/
haiku
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

cdda: fixes 64 bit warnings

This commit is contained in:
Jérôme Duval 2013-05-06 19:05:30 +02:00
parent 267a780ab5
commit 575eeda9a5
2 changed files with 15 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/add-ons/kernel/file_systems/cdda/cdda.cpp
View File

@ -557,7 +557,7 @@ read_cdtext(int fd, struct cdtext &cdtext)
scsi_toc_general *header = (scsi_toc_general *)buffer;
size_t packLength = B_BENDIAN_TO_HOST_INT16(header->data_length) - 2;
uint32 packLength = B_BENDIAN_TO_HOST_INT16(header->data_length) - 2;
cdtext_pack_data *pack = (cdtext_pack_data *)(header + 1);
cdtext_pack_data *lastPack = NULL;
uint8 state = 0;
@ -656,8 +656,8 @@ status_t
read_cdda_data(int fd, off_t endFrame, off_t offset, void *data, size_t length,
off_t bufferOffset, void *buffer, size_t bufferSize)
{
if (bufferOffset >= 0 && bufferOffset <= offset + length
&& bufferOffset + bufferSize > offset) {
if (bufferOffset >= 0 && bufferOffset <= offset + (off_t)length
&& bufferOffset + (off_t)bufferSize > offset) {
if (offset >= bufferOffset) {
// buffer reaches into the beginning of the request
off_t dataOffset = offset - bufferOffset;

24
src/add-ons/kernel/file_systems/cdda/kernel_interface.cpp
View File

@ -153,7 +153,7 @@ public:
status_t SetSize(off_t size);
const char* Name() const { return fName; }
size_t Size() const { return fSize; }
off_t Size() const { return fSize; }
type_code Type() const { return fType; }
uint8* Data() const { return fData; }
@ -164,7 +164,7 @@ private:
char* fName;
type_code fType;
uint8* fData;
size_t fSize;
off_t fSize;
};
class Inode {
@ -473,7 +473,7 @@ open_attributes(uint32 cddbID, int deviceFD, int mode,
if (attrMode == kDiscIDAttributes) {
char id[64];
snprintf(id, sizeof(id), "/%08lx", cddbID);
snprintf(id, sizeof(id), "/%08" B_PRIx32, cddbID);
strlcat(path, id, B_PATH_NAME_LENGTH);
} else if (attrMode == kDeviceAttributes) {
uint32 length = strlen(path);
@ -690,14 +690,14 @@ Volume::Mount(const char* device)
if (text.titles[i] != NULL) {
if (text.artists[i] != NULL) {
snprintf(title, sizeof(title), "%02ld. %s - %s.wav", track,
text.artists[i], text.titles[i]);
snprintf(title, sizeof(title), "%02" B_PRId32 ". %s - %s.wav",
track, text.artists[i], text.titles[i]);
} else {
snprintf(title, sizeof(title), "%02ld. %s.wav", track,
text.titles[i]);
snprintf(title, sizeof(title), "%02" B_PRId32 ". %s.wav",
track, text.titles[i]);
}
} else
snprintf(title, sizeof(title), "Track %02ld.wav", track);
snprintf(title, sizeof(title), "Track %02" B_PRId32 ".wav", track);
// remove '/' and '\n' from title
for (int32 j = 0; title[j]; j++) {
@ -722,7 +722,7 @@ Volume::Mount(const char* device)
inode->AddAttribute("Audio:Track", B_INT32_TYPE, (uint32)track);
inode->AddAttribute("Audio:Bitrate", B_STRING_TYPE, "1411 kbps");
inode->AddAttribute("Media:Length", B_INT64_TYPE,
inode->FrameCount() * 1000000LL / kFramesPerSecond);
inode->FrameCount() * 1000000L / kFramesPerSecond);
inode->AddAttribute("BEOS:TYPE", B_MIME_STRING_TYPE, "audio/x-wav");
}
@ -1044,7 +1044,7 @@ Attribute::ReadAt(off_t offset, uint8* buffer, size_t* _length)
*_length = 0;
return B_OK;
}
if (offset + length > fSize)
if (offset + (off_t)length > fSize)
length = fSize - offset;
if (user_memcpy(buffer, fData + offset, length) < B_OK)
@ -1710,13 +1710,13 @@ cdda_read(fs_volume* _volume, fs_vnode* _node, void* _cookie, off_t offset,
}
size_t length = *_length;
if (offset + length > maxSize)
if (offset + (off_t)length > maxSize)
length = maxSize - offset;
status_t status = B_OK;
size_t bytesRead = 0;
if (offset < sizeof(wav_header)) {
if (offset < (off_t)sizeof(wav_header)) {
// read fake WAV header
size_t size = sizeof(wav_header) - offset;
size = min_c(size, length);