diff options
author | OctaneSnail <os@v12pwr.com> | 2008-12-14 00:20:45 +0300 |
---|---|---|
committer | OctaneSnail <os@v12pwr.com> | 2008-12-14 12:44:25 +0300 |
commit | e71f420038ea839ef5fef530c8c33450ba38a592 (patch) | |
tree | c56327678d6023048962440a887b44e6cb72b4c8 | |
parent | 754b4118884ee4203bfd0892d91d6821d290bd70 (diff) |
Fix datatypes in all printf format strings.
-rw-r--r-- | Mediatype.cpp | 2 | ||||
-rw-r--r-- | OutputPin.cpp | 12 | ||||
-rw-r--r-- | RFS.cpp | 2 | ||||
-rw-r--r-- | Utils.cpp | 2 |
4 files changed, 9 insertions, 9 deletions
diff --git a/Mediatype.cpp b/Mediatype.cpp index 5b08863..fd5a641 100644 --- a/Mediatype.cpp +++ b/Mediatype.cpp @@ -317,7 +317,7 @@ static HRESULT SyncRead (File *file, LONGLONG llPosition, DWORD lLength, BYTE* p pos = FindStartPart (file,llPosition); if (pos == -1) { - DbgLog((LOG_TRACE, 2, L"Mediatype.cpp - FindStartPart bailed length = %d, pos = %d", lLength, llPosition)); + DbgLog((LOG_TRACE, 2, L"Mediatype.cpp - FindStartPart bailed length = %lu, pos = %lld", lLength, llPosition)); return ERROR_HANDLE_EOF; } diff --git a/OutputPin.cpp b/OutputPin.cpp index 4090a52..d1a9029 100644 --- a/OutputPin.cpp +++ b/OutputPin.cpp @@ -129,7 +129,7 @@ STDMETHODIMP CRFSOutputPin::RequestAllocator (IMemAllocator *pPreferred, ALLOCAT ALLOCATOR_PROPERTIES actual; HRESULT hr; - DbgLog((LOG_TRACE, 2, L"Requested alignment = %d", pProps->cbAlign)); + DbgLog((LOG_TRACE, 2, L"Requested alignment = %ld", pProps->cbAlign)); if (pProps->cbAlign) m_align = pProps->cbAlign; else @@ -212,7 +212,7 @@ HRESULT CRFSOutputPin::ConvertSample (IMediaSample* sample, LONGLONG *pos, DWORD if (llPos > llTotal) { - DbgLog((LOG_TRACE, 2, L"ConvertSample EOF pos = %d total = %d", llPos, llTotal)); + DbgLog((LOG_TRACE, 2, L"ConvertSample EOF pos = %lld total = %lld", llPos, llTotal)); return ERROR_HANDLE_EOF; } @@ -269,7 +269,7 @@ STDMETHODIMP CRFSOutputPin::Request (IMediaSample* pSample, DWORD_PTR dwUser) if(!(IsAligned (llPosition) && IsAligned (lLength) && IsAligned ((INT_PTR) pBuffer))) { - DbgLog((LOG_TRACE, 2, L"SyncReadAligned bad alignment. align = %d, pos = %d, len = %d, buf = %p", + DbgLog((LOG_TRACE, 2, L"SyncReadAligned bad alignment. align = %lu, pos = %lld, len = %lu, buf = %p", m_align, llPosition, lLength, pBuffer)); return VFW_E_BADALIGN; } @@ -494,7 +494,7 @@ STDMETHODIMP CRFSOutputPin::WaitForNext (DWORD dwTimeout, IMediaSample **ppSampl // TODO: Try to recover if read != sr->expected. if (read != sr->expected) { - DbgLog((LOG_TRACE, 2, L"CRFSOutputPin::WaitForNext Got %d expected %d!", read, sr->expected)); + DbgLog((LOG_TRACE, 2, L"CRFSOutputPin::WaitForNext Got %lu expected %lu!", read, sr->expected)); delete sr; ret = S_FALSE; break; @@ -527,7 +527,7 @@ STDMETHODIMP CRFSOutputPin::SyncReadAligned (IMediaSample* pSample) if(!(IsAligned (llPosition) && IsAligned (lLength) && IsAligned ((INT_PTR) pBuffer))) { - DbgLog((LOG_TRACE, 2, L"SyncReadAligned bad alignment. align = %d, pos = %d, len = %d, buf = %p", + DbgLog((LOG_TRACE, 2, L"SyncReadAligned bad alignment. align = %lu, pos = %lld, len = %lu, buf = %p", m_align, llPosition, lLength, pBuffer)); return VFW_E_BADALIGN; } @@ -572,7 +572,7 @@ HRESULT CRFSOutputPin::SyncRead (LONGLONG llPosition, DWORD lLength, BYTE* pBuff pos = FindStartPart (llPosition); if (pos == -1) { - DbgLog((LOG_TRACE, 2, L"FindStartPart bailed length = %d, pos = %d", lLength, llPosition)); + DbgLog((LOG_TRACE, 2, L"FindStartPart bailed length = %lu, pos = %lld", lLength, llPosition)); return ERROR_HANDLE_EOF; } @@ -409,7 +409,7 @@ int CRARFileSource::ScanArchive (wchar_t *archive_name, List<File> *file_list, i continue; } - DbgLog ((LOG_TRACE, 2, L"SIZE %08x %08x OS %02x CRC %08x TIMESTAMP %08x VERSION %d METHOD %02x LEN %04x ATTRIB %08x", + DbgLog ((LOG_TRACE, 2, L"SIZE %08lx %08lx OS %02x CRC %08lx TIMESTAMP %08lx VERSION %d METHOD %02x LEN %04lx ATTRIB %08lx", rh.fh.size.HighPart, rh.fh.size.LowPart, rh.fh.os, rh.fh.crc, rh.fh.timestamp, rh.fh.version, rh.fh.method, rh.fh.name_len, rh.fh.attributes)); DbgLog ((LOG_TRACE, 2, L"FILENAME \"%S\"", rh.fh.filename)); @@ -95,7 +95,7 @@ void LogHeader (rar_header_t *rh) int i; WORD flags = rh->ch.flags; - DbgLog ((LOG_TRACE, 2, L"Header CRC %04x TYPE %02x FLAGS %04x SIZE %08x %08x", + DbgLog ((LOG_TRACE, 2, L"Header CRC %04hx TYPE %02x FLAGS %04hx SIZE %08lx %08lx", rh->ch.crc, rh->ch.type, rh->ch.flags, rh->ch.size.HighPart, rh->ch.size.LowPart)); switch (rh->ch.type) |