From: Jaroslav Kysela <perex@perex.cz>
Date: Mon, 29 May 2017 16:03:05 +0000 (+0200)
Subject: linuxdvb ca: show all CAIDs
X-Git-Tag: v4.2.3~52
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=6c968b38f1228349cb7231186e580c0d1a665af3;p=thirdparty%2Ftvheadend.git

linuxdvb ca: show all CAIDs
---

diff --git a/src/input/mpegts/linuxdvb/linuxdvb_ca.c b/src/input/mpegts/linuxdvb/linuxdvb_ca.c
index c2b19ef30..1d9af24d9 100644
--- a/src/input/mpegts/linuxdvb/linuxdvb_ca.c
+++ b/src/input/mpegts/linuxdvb/linuxdvb_ca.c
@@ -509,21 +509,20 @@ linuxdvb_ca_ca_info_callback(void *arg, uint8_t slot_id, uint16_t session_num,
                              uint32_t ca_id_count, uint16_t *ca_ids)
 {
     linuxdvb_ca_t * lca = arg;
-    uint32_t i;
+    uint32_t i, j;
     char buf[256];
     size_t c = 0;
 
     dvbcam_unregister_cam(lca, 0);
     dvbcam_register_cam(lca, 0, ca_ids, ca_id_count);
 
-
-    for(i=0; i< ca_id_count; i++) {
-        tvh_strlcatf(buf, sizeof(buf), c, " %04X", ca_ids[i]);
-        tvh_strlcatf(buf, sizeof(buf), c, " (%s)",
-                     caid2name(ca_ids[i]));
+    for (i = 0; i < ca_id_count; ) {
+      for (j = 0, buf[0] = '\0'; j < 4 && i < ca_id_count; i++, j++)
+          tvh_strlcatf(buf, sizeof(buf), c, " %04X (%s)",
+                       ca_ids[i], caid2name(ca_ids[i]));
+      tvhinfo(LS_EN50221, "CAM slot %u supported CAIDs: %s", slot_id, buf);
     }
 
-    tvhinfo(LS_EN50221, "CAM slot %u supported CAIDs: %s", slot_id, buf);
     return 0;
 }