[SCM] kodi-pvr-vdr-vnsi/master: responsepacket: use size_t instead of uint32_t for memory sizes

[tiber-guest at users.alioth.debian.org]

The following commit has been merged in the master branch:
commit 12e925a90399a26b82c308132d07d1fdc391ece9
Author: Max Kellermann <max at duempel.org>
Date:   Thu Nov 5 11:15:34 2015 +0100

    responsepacket: use size_t instead of uint32_t for memory sizes

diff --git a/src/responsepacket.cpp b/src/responsepacket.cpp
index 4842de9..b331286 100644
--- a/src/responsepacket.cpp
+++ b/src/responsepacket.cpp
@@ -62,7 +62,7 @@ void cResponsePacket::getOSDData(uint32_t &wnd, uint32_t &color, uint32_t &x0, u
   y1 = osdY1;
 }
 
-void cResponsePacket::setResponse(uint8_t* tuserData, uint32_t tuserDataLength)
+void cResponsePacket::setResponse(uint8_t* tuserData, size_t tuserDataLength)
 {
   channelID       = VNSI_CHANNEL_REQUEST_RESPONSE;
   userData        = tuserData;
@@ -70,7 +70,7 @@ void cResponsePacket::setResponse(uint8_t* tuserData, uint32_t tuserDataLength)
   packetPos       = 0;
 }
 
-void cResponsePacket::setStatus(uint8_t* tuserData, uint32_t tuserDataLength)
+void cResponsePacket::setStatus(uint8_t* tuserData, size_t tuserDataLength)
 {
   channelID       = VNSI_CHANNEL_STATUS;
   userData        = tuserData;
@@ -78,7 +78,7 @@ void cResponsePacket::setStatus(uint8_t* tuserData, uint32_t tuserDataLength)
   packetPos       = 0;
 }
 
-void cResponsePacket::setStream(uint8_t* tuserData, uint32_t tuserDataLength)
+void cResponsePacket::setStream(uint8_t* tuserData, size_t tuserDataLength)
 {
   channelID       = VNSI_CHANNEL_STREAM;
   // set pointer to user data
@@ -87,7 +87,7 @@ void cResponsePacket::setStream(uint8_t* tuserData, uint32_t tuserDataLength)
   packetPos       = 0;
 }
 
-void cResponsePacket::setOSD(uint8_t* tuserData, uint32_t tuserDataLength)
+void cResponsePacket::setOSD(uint8_t* tuserData, size_t tuserDataLength)
 {
   channelID       = VNSI_CHANNEL_OSD;
   // set pointer to user data
diff --git a/src/responsepacket.h b/src/responsepacket.h
index 79cc955..e741f27 100644
--- a/src/responsepacket.h
+++ b/src/responsepacket.h
@@ -22,6 +22,7 @@
 
 #include <stdio.h>
 #include <stdint.h>
+#include <stddef.h>
 
 class cResponsePacket
 {
@@ -29,10 +30,10 @@ class cResponsePacket
     cResponsePacket();
     ~cResponsePacket();
 
-    void setResponse(uint8_t* packet, uint32_t packetLength);
-    void setStatus(uint8_t* packet, uint32_t packetLength);
-    void setStream(uint8_t* packet, uint32_t packetLength);
-    void setOSD(uint8_t* packet, uint32_t packetLength);
+    void setResponse(uint8_t* packet, size_t packetLength);
+    void setStatus(uint8_t* packet, size_t packetLength);
+    void setStream(uint8_t* packet, size_t packetLength);
+    void setOSD(uint8_t* packet, size_t packetLength);
 
     void extractHeader();
     void extractStreamHeader();
@@ -40,7 +41,7 @@ class cResponsePacket
 
     bool noResponse() { return (userData == NULL); };
 
-    uint32_t  getUserDataLength() const { return userDataLength; }
+    size_t    getUserDataLength() const { return userDataLength; }
     uint32_t  getChannelID() const { return channelID; }
     uint32_t  getRequestID() const { return requestID; }
     uint32_t  getStreamID() const { return streamID; }
@@ -51,7 +52,7 @@ class cResponsePacket
     uint32_t  getMuxSerial() const { return muxSerial; }
     void      getOSDData(uint32_t &wnd, uint32_t &color, uint32_t &x0, uint32_t &y0, uint32_t &x1, uint32_t &y1);
 
-    uint32_t  getPacketPos() const { return packetPos; }
+    size_t    getPacketPos() const { return packetPos; }
 
     size_t getRemainingLength() const {
       return userDataLength - packetPos;
@@ -69,15 +70,15 @@ class cResponsePacket
     uint8_t* getUserData();
 
     uint8_t* getHeader() { return header; };
-    unsigned int getStreamHeaderLength() const { return 36; };
-    unsigned int getHeaderLength() const { return 8; };
-    unsigned int getOSDHeaderLength() const { return 32; } ;
+    size_t getStreamHeaderLength() const { return 36; };
+    size_t getHeaderLength() const { return 8; };
+    size_t getOSDHeaderLength() const { return 32; } ;
 
   private:
     uint8_t  header[40];
     uint8_t* userData;
-    uint32_t userDataLength;
-    uint32_t packetPos;
+    size_t   userDataLength;
+    size_t   packetPos;
 
     uint32_t channelID;
 

-- 
kodi-pvr-vdr-vnsi packaging