Fix 32-bit int assumption and implicit narrowing cast in DVB CA.

This was caught by C++ as invalid C++11 code, and compiles to the wrong code in C++03 on ABI's with a 64 bit int.
MythTV · Nov 26, 2012 · 9b7aec0 · 9b7aec0
1 parent 3310050
commit 9b7aec0
Showing 1 changed file with 8 additions and 6 deletions.
diff --git a/mythtv/libs/libmythtv/recorders/dvbdev/dvbci.cpp b/mythtv/libs/libmythtv/recorders/dvbdev/dvbci.cpp
@@ -847,12 +847,14 @@ bool cCiResourceManager::Process(int Length, const uint8_t *Data)
      switch (Tag) {
        case AOT_PROFILE_ENQ: {
             dbgprotocol("%d: <== Profile Enquiry\n", SessionId());
-            int resources[] = { htonl(RI_RESOURCE_MANAGER),
-                                htonl(RI_APPLICATION_INFORMATION),
-                                htonl(RI_CONDITIONAL_ACCESS_SUPPORT),
-                                htonl(RI_DATE_TIME),
-                                htonl(RI_MMI)
-                              };
+            uint32_t resources[] =
+            {
+                htonl(RI_RESOURCE_MANAGER),
+                htonl(RI_APPLICATION_INFORMATION),
+                htonl(RI_CONDITIONAL_ACCESS_SUPPORT),
+                htonl(RI_DATE_TIME),
+                htonl(RI_MMI)
+            };
             dbgprotocol("%d: ==> Profile\n", SessionId());
             SendData(AOT_PROFILE, sizeof(resources), (uint8_t*)resources);
             state = 3;