From 91b1b38f597df4aecef91d4a3afa427c948db213 Mon Sep 17 00:00:00 2001 From: Adam Sutton Date: Fri, 24 Aug 2012 11:15:54 +0100 Subject: [PATCH] A few minor corrections to format strings. --- src/cwc.c | 8 ++++---- src/webui/webui.c | 10 +++++----- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/src/cwc.c b/src/cwc.c index cfdc9b1b..037b7f4c 100644 --- a/src/cwc.c +++ b/src/cwc.c @@ -805,7 +805,7 @@ handle_ecm_reply(cwc_service_t *ct, ecm_section_t *es, uint8_t *msg, } tvhlog(LOG_DEBUG, "cwc", "Received NOK for service \"%s\"%s (seqno: %d " - "Req delay: %"PRIu64" ms)", t->s_svcname, chaninfo, seq, delay); + "Req delay: %"PRId64" ms)", t->s_svcname, chaninfo, seq, delay); forbid: LIST_FOREACH(ep, &ct->cs_pids, ep_link) { @@ -821,7 +821,7 @@ forbid: } tvhlog(LOG_ERR, "cwc", "Can not descramble service \"%s\", access denied (seqno: %d " - "Req delay: %"PRIu64" ms)", + "Req delay: %"PRId64" ms)", t->s_svcname, seq, delay); ct->cs_keystate = CS_FORBIDDEN; return; @@ -835,7 +835,7 @@ forbid: "Received ECM reply%s for service \"%s\" " "even: %02x.%02x.%02x.%02x.%02x.%02x.%02x.%02x" " odd: %02x.%02x.%02x.%02x.%02x.%02x.%02x.%02x (seqno: %d " - "Req delay: %"PRIu64" ms)", + "Req delay: %"PRId64" ms)", chaninfo, t->s_svcname, msg[3 + 0], msg[3 + 1], msg[3 + 2], msg[3 + 3], msg[3 + 4], @@ -858,7 +858,7 @@ forbid: if(ct->cs_keystate != CS_RESOLVED) tvhlog(LOG_INFO, "cwc", - "Obtained key for service \"%s\" in %"PRIu64" ms, from %s:%i", + "Obtained key for service \"%s\" in %"PRId64" ms, from %s:%i", t->s_svcname, delay, ct->cs_cwc->cwc_hostname, ct->cs_cwc->cwc_port); diff --git a/src/webui/webui.c b/src/webui/webui.c index 77bea8c4..a6064ad3 100644 --- a/src/webui/webui.c +++ b/src/webui/webui.c @@ -361,7 +361,7 @@ http_dvr_list_playlist(http_connection_t *hc) dvr_entry_t *de; const char *host; off_t fsize; - size_t durration; + time_t durration; int bandwidth; hq = &hc->hc_reply; @@ -377,9 +377,9 @@ http_dvr_list_playlist(http_connection_t *hc) durration += (de->de_stop_extra + de->de_start_extra)*60; bandwidth = ((8*fsize) / (durration*1024.0)); - htsbuf_qprintf(hq, "#EXTINF:%"PRId64",%s\n", durration, lang_str_get(de->de_title, NULL)); + htsbuf_qprintf(hq, "#EXTINF:%"PRItime_t",%s\n", durration, lang_str_get(de->de_title, NULL)); - htsbuf_qprintf(hq, "#EXT-X-TARGETDURATION:%"PRId64"\n", durration); + htsbuf_qprintf(hq, "#EXT-X-TARGETDURATION:%"PRItime_t"\n", durration); htsbuf_qprintf(hq, "#EXT-X-STREAM-INF:PROGRAM-ID=%d,BANDWIDTH=%d\n", de->de_id, bandwidth); snprintf(buf, sizeof(buf), "/dvrfile/%d", de->de_id); @@ -415,9 +415,9 @@ http_dvr_playlist(http_connection_t *hc, dvr_entry_t *de) bandwidth = ((8*fsize) / (durration*1024.0)); htsbuf_qprintf(hq, "#EXTM3U\n"); - htsbuf_qprintf(hq, "#EXTINF:%"PRId64",%s\n", durration, lang_str_get(de->de_title, NULL)); + htsbuf_qprintf(hq, "#EXTINF:%"PRItime_t",%s\n", durration, lang_str_get(de->de_title, NULL)); - htsbuf_qprintf(hq, "#EXT-X-TARGETDURATION:%"PRId64"\n", durration); + htsbuf_qprintf(hq, "#EXT-X-TARGETDURATION:%"PRItime_t"\n", durration); htsbuf_qprintf(hq, "#EXT-X-STREAM-INF:PROGRAM-ID=%d,BANDWIDTH=%d\n", de->de_id, bandwidth); snprintf(buf, sizeof(buf), "/dvrfile/%d", de->de_id);