en50221: capmt dump - fix again the hexa log

diff --git a/src/input/mpegts/en50221/en50221_capmt.c b/src/input/mpegts/en50221/en50221_capmt.c
index 9147cc1aebdff7dd08807160c630590fe1b3415d..c9a732153dbb25019159cc827c347a42a7e47b93 100644 (file)
--- a/src/input/mpegts/en50221/en50221_capmt.c
+++ b/src/input/mpegts/en50221/en50221_capmt.c
@@ -311,7 +311,7 @@ void en50221_capmt_dump
         caid = extract_2byte(p + 2);
         pid  = extract_pid(p + 4);
         tvhtrace(subsys, "%s:   CAPMT CA descriptor caid %04X pid %04x length %d (%s)",
-                         prefix, caid, pid, dlen, bin2hex(hbuf, sizeof(hbuf), p + 6, l - 4));
+                         prefix, caid, pid, dlen, bin2hex(hbuf, sizeof(hbuf), p + 6, dlen - 4));
       }
       p += dlen + 2;
       l -= dlen + 2;
@@ -342,7 +342,7 @@ void en50221_capmt_dump
           caid = extract_2byte(p + 2);
           pid  = extract_pid(p + 4);
           tvhtrace(subsys, "%s:     CAPMT ES CA descriptor caid %04X pid %04x length %d (%s)",
-                           prefix, caid, pid, dlen, bin2hex(hbuf, sizeof(hbuf), p + 6, l - 4));
+                           prefix, caid, pid, dlen, bin2hex(hbuf, sizeof(hbuf), p + 6, dlen - 4));
         }
         p += dlen + 2;
         l -= dlen + 2;

diff --git a/src/uuid.c b/src/uuid.c
index eba3b954d4cfc967a96d711c064ada40abab45e8..b95fb058f4fc37a145467574acc1cf7ebe15e501 100644 (file)
--- a/src/uuid.c
+++ b/src/uuid.c
@@ -80,6 +80,7 @@ char *
 bin2hex(char *dst, size_t dstlen, const uint8_t *src, size_t srclen)
 {
   static const char table[] = "0123456789abcdef";
+  char *ret = dst;
   while(dstlen > 2 && srclen > 0) {
     *dst++ = table[*src >> 4];
     *dst++ = table[*src & 0xf];
@@ -88,7 +89,7 @@ bin2hex(char *dst, size_t dstlen, const uint8_t *src, size_t srclen)
     dstlen -= 2;
   }
   *dst = 0;
-  return dst;
+  return ret;
 }
 
 /* **************************************************************************