diff options
| author | Andreas Oberritter <obi@opendreambox.org> | 2011-02-05 00:52:14 +0100 |
|---|---|---|
| committer | Andreas Oberritter <obi@opendreambox.org> | 2011-02-05 00:52:14 +0100 |
| commit | 33e4aeedec7bde0b0f853396f7b308412bd85496 (patch) | |
| tree | 077eed5fd9e42d2000dc7d09b2621fe0d3b82a8e /lib/dvb | |
| parent | 423b12c94b41e0f7e9a7715b06ba7f479c197780 (diff) | |
| parent | 3ca124dd916f82dcfd4f069daf1a3f342956e520 (diff) | |
| download | enigma2-33e4aeedec7bde0b0f853396f7b308412bd85496.tar.gz enigma2-33e4aeedec7bde0b0f853396f7b308412bd85496.zip | |
Merge branch 'obi/master'
Diffstat (limited to 'lib/dvb')
| -rw-r--r-- | lib/dvb/dvb.cpp | 12 | ||||
| -rw-r--r-- | lib/dvb/esection.h | 2 | ||||
| -rw-r--r-- | lib/dvb/scan.cpp | 4 |
3 files changed, 9 insertions, 9 deletions
diff --git a/lib/dvb/dvb.cpp b/lib/dvb/dvb.cpp index 6c353c34..c2ddb409 100644 --- a/lib/dvb/dvb.cpp +++ b/lib/dvb/dvb.cpp @@ -110,7 +110,7 @@ eDVBResourceManager::eDVBResourceManager() m_boxtype = DM8000; } - eDebug("found %d adapter, %d frontends(%d sim) and %d demux, boxtype %d", + eDebug("found %zd adapter, %zd frontends(%zd sim) and %zd demux, boxtype %d", m_adapter.size(), m_frontend.size(), m_simulate_frontend.size(), m_demux.size(), m_boxtype); eDVBCAService::registerChannelCallback(this); @@ -336,7 +336,7 @@ PyObject *eDVBResourceManager::setFrontendSlotInformations(ePyObject list) } if (assigned != m_frontend.size()) { char blasel[256]; - sprintf(blasel, "eDVBResourceManager::setFrontendSlotInformations .. assigned %d socket informations, but %d registered frontends!", + sprintf(blasel, "eDVBResourceManager::setFrontendSlotInformations .. assigned %zd socket informations, but %d registered frontends!", m_frontend.size(), assigned); PyErr_SetString(PyExc_StandardError, blasel); return NULL; @@ -1490,7 +1490,7 @@ void eDVBChannel::getNextSourceSpan(off_t current_offset, size_t bytes_read, off size = max; else size = aligned_end - current_offset; - eDebug("HIT, %lld < %lld < %lld, size: %d", i->first, current_offset, i->second, size); + eDebug("HIT, %lld < %lld < %lld, size: %zd", i->first, current_offset, i->second, size); return; } if (current_offset < aligned_start) @@ -1531,10 +1531,10 @@ void eDVBChannel::getNextSourceSpan(off_t current_offset, size_t bytes_read, off len = aligned_end - aligned_start; start = aligned_end - len; - eDebug("skipping to %llx, %d", start, len); + eDebug("skipping to %llx, %zd", start, len); } - eDebug("result: %llx, %x (%llx %llx)", start, size, aligned_start, aligned_end); + eDebug("result: %llx, %zx (%llx %llx)", start, size, aligned_start, aligned_end); return; } } @@ -1550,7 +1550,7 @@ void eDVBChannel::getNextSourceSpan(off_t current_offset, size_t bytes_read, off { start = current_offset; size = max; - eDebug("NO CUESHEET. (%08llx, %d)", start, size); + eDebug("NO CUESHEET. (%08llx, %zd)", start, size); } else { start = current_offset; diff --git a/lib/dvb/esection.h b/lib/dvb/esection.h index 2bb17a98..833cc93b 100644 --- a/lib/dvb/esection.h +++ b/lib/dvb/esection.h @@ -63,7 +63,7 @@ protected: else TABLE_eDebugNoNewLine("-"); - TABLE_eDebug(" %d/%d TID %02x", avail.size(), max, data[0]); + TABLE_eDebug(" %zd/%d TID %02x", avail.size(), max, data[0]); if (avail.size() == max) { diff --git a/lib/dvb/scan.cpp b/lib/dvb/scan.cpp index d559614c..fb6f2048 100644 --- a/lib/dvb/scan.cpp +++ b/lib/dvb/scan.cpp @@ -193,9 +193,9 @@ RESULT eDVBScan::nextChannel() if (m_ch_toScan.empty()) { SCAN_eDebug("no channels left to scan."); - SCAN_eDebug("%d channels scanned, %d were unavailable.", + SCAN_eDebug("%zd channels scanned, %zd were unavailable.", m_ch_scanned.size(), m_ch_unavailable.size()); - SCAN_eDebug("%d channels in database.", m_new_channels.size()); + SCAN_eDebug("%zd channels in database.", m_new_channels.size()); m_event(evtFinish); return -ENOENT; } |