mirror/taglib
1
0
Fork 0
mirror of https://github.com/taglib/taglib.git synced 2025-06-04 01:28:21 -04:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #109 from TsudaKageyu/taglib2

Browse Source 
Fix GCC warnings in FileStream
This commit is contained in:
Tsuda Kageyu 2013-03-21 02:39:17 -07:00
commit b4df82a0b0
1 changed files with 18 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
taglib/toolkit/tfilestream.cpp
View File

@ -362,7 +362,7 @@ bool FileStream::isOpen() const
void FileStream::seek(offset_t offset, Position p)
{
if(!d->file) {
debug("File::seek() -- trying to seek in a file that isn't opened.");
debug("FileStream::seek() -- trying to seek in a file that isn't opened.");
return;
}
@ -379,6 +379,9 @@ void FileStream::seek(offset_t offset, Position p)
case End:
whence = FILE_END;
break;
default:
debug("FileStream::seek() -- Invalid Position value.");
return;
}
LARGE_INTEGER largeOffset = {};
@ -398,6 +401,9 @@ void FileStream::seek(offset_t offset, Position p)
case End:
whence = SEEK_END;
break;
default:
debug("FileStream::seek() -- Invalid Position value.");
return;
}
# ifdef _LARGEFILE_SOURCE
@ -430,7 +436,7 @@ offset_t FileStream::tell() const
{
#ifdef _WIN32
LARGE_INTEGER largeOffset = {};
const LARGE_INTEGER largeOffset = {};
LARGE_INTEGER newPointer;
SetFilePointerEx(d->file, largeOffset, &newPointer, FILE_CURRENT);
@ -462,7 +468,7 @@ offset_t FileStream::length()
if(!d->file)
return 0;
offset_t currentPosition = tell();
const offset_t currentPosition = tell();
seek(0, End);
offset_t endPosition = tell();
@ -481,16 +487,21 @@ void FileStream::truncate(offset_t length)
{
#ifdef _WIN32
offset_t currentPosition = tell();
const offset_t currentPosition = tell();
seek(length);
SetEndOfFile(d->file);
BOOL set = SetEndOfFile(d->file);
if(!set) {
debug("FileStream::truncate() -- Coundn't truncate the file.");
}
seek(currentPosition);
#else
ftruncate(fileno(d->file), length);
const int error = ftruncate(fileno(d->file), length);
if(error != 0) {
debug("FileStream::truncate() -- Coundn't truncate the file.");
}
#endif
}