From 48008d4ffaf604661671f645466db46d45b5a659 Mon Sep 17 00:00:00 2001 From: max_10 Date: Thu, 4 Dec 2014 19:49:18 +0100 Subject: [PATCH] fix compiler warning Origin commit data ------------------ Branch: master Commit: https://github.com/neutrino-images/ni-libstb-hal/commit/da66fc3db5272c8c2c3fc9d1c6fd4f09836e1763 Author: max_10 Date: 2014-12-04 (Thu, 04 Dec 2014) ------------------ No further description and justification available within origin commit message! ------------------ This commit was generated by Migit --- libdvbci/dvbci_session.cpp | 6 +++--- libspark/video.cpp | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/libdvbci/dvbci_session.cpp b/libdvbci/dvbci_session.cpp index e1a7cdf..a1af100 100644 --- a/libdvbci/dvbci_session.cpp +++ b/libdvbci/dvbci_session.cpp @@ -316,7 +316,7 @@ void eDVBCISession::receiveData(tSlot *slot, const unsigned char *ptr, size_t le while (len > 0) { int alen; - const unsigned char *tag = pkt; + const unsigned char *stag = pkt; pkt += 3; // tag len -= 3; hlen = parseLengthField(pkt, alen); @@ -331,9 +331,9 @@ void eDVBCISession::receiveData(tSlot *slot, const unsigned char *ptr, size_t le alen = len; } - printf("1. Call receivedAPDU tag = 0x%2x, len = %d\n", (int) tag, alen); + printf("1. Call receivedAPDU tag = 0x%2x, len = %d\n", (int) stag, alen); - if (session->receivedAPDU(tag, pkt, alen)) + if (session->receivedAPDU(stag, pkt, alen)) session->action = 1; pkt += alen; len -= alen; diff --git a/libspark/video.cpp b/libspark/video.cpp index 5ce81e7..9d72f2f 100644 --- a/libspark/video.cpp +++ b/libspark/video.cpp @@ -494,7 +494,7 @@ void cVideo::ShowPicture(const char * fname, const char *_destname) if (ioctl(fd, VIDEO_SET_FORMAT, VIDEO_FORMAT_16_9) < 0) lt_info("%s: VIDEO_SET_FORMAT failed (%m)\n", __func__); bool seq_end_avail = false; - size_t pos=0; + off_t pos=0; unsigned char *iframe = (unsigned char *)malloc((st.st_size < 8192) ? 8192 : st.st_size); if (! iframe) {