From: Jaroslav Kysela <perex@perex.cz>
Date: Mon, 5 Mar 2018 19:37:14 +0000 (+0100)
Subject: mpegts pid: reshuffle code in mpegts_pid_dump()
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=773bdb86eb14c7a2169e0291b88679cf570cad19;p=thirdparty%2Ftvheadend.git

mpegts pid: reshuffle code in mpegts_pid_dump()
---

diff --git a/src/input/mpegts/mpegts_pid.c b/src/input/mpegts/mpegts_pid.c
index d00f916aa..d5a4b006a 100644
--- a/src/input/mpegts/mpegts_pid.c
+++ b/src/input/mpegts/mpegts_pid.c
@@ -371,22 +371,21 @@ mpegts_pid_dump(mpegts_apids_t *pids, char *buf, int len, int wflag, int raw)
     return len;
   if (pids->all)
     return snprintf(buf, len, "all");
-  if (!raw)
+  if (!raw) {
     mpegts_pid_weighted(&spids, pids, len / 2);
-  else {
-    mpegts_pid_init(&spids);
-    mpegts_pid_copy(&spids, pids);
+    pids = &spids;
   }
   *buf = '\0';
   if (wflag) {
-    for (i = 0; i < spids.count && l + 1 < len; i++) {
-      p = &spids.pids[i];
+    for (i = 0; i < pids->count && l + 1 < len; i++) {
+      p = &pids->pids[i];
       tvh_strlcatf(buf, len, l, "%s%i(%i)", i > 0 ? "," : "", p->pid, p->weight);
     }
   } else {
-    for (i = 0; i < spids.count && l + 1 < len; i++)
-     tvh_strlcatf(buf, len, l, "%s%i", i > 0 ? "," : "", spids.pids[i].pid);
+    for (i = 0; i < pids->count && l + 1 < len; i++)
+     tvh_strlcatf(buf, len, l, "%s%i", i > 0 ? "," : "", pids->pids[i].pid);
   }
-  mpegts_pid_done(&spids);
+  if (pids == &spids)
+    mpegts_pid_done(&spids);
   return l;
 }