diff --git a/src/cwc.c b/src/cwc.c index 2a872e31..cfdc9b1b 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: %lld ms)", t->s_svcname, chaninfo, seq, delay); + "Req delay: %"PRIu64" 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: %lld ms)", + "Req delay: %"PRIu64" 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: %lld ms)", + "Req delay: %"PRIu64" 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 %lld ms, from %s:%i", + "Obtained key for service \"%s\" in %"PRIu64" ms, from %s:%i", t->s_svcname, delay, ct->cs_cwc->cwc_hostname, ct->cs_cwc->cwc_port); diff --git a/src/dvb/dvb_fe.c b/src/dvb/dvb_fe.c index 173f9700..8044100a 100644 --- a/src/dvb/dvb_fe.c +++ b/src/dvb/dvb_fe.c @@ -498,7 +498,7 @@ dvb_fe_tune(th_dvb_mux_instance_t *tdmi, const char *reason) if(r != 0) { tvhlog(LOG_ERR, "dvb", "\"%s\" tuning to \"%s\"" - " -- Front configuration failed -- %s, frequency: %ld", + " -- Front configuration failed -- %s, frequency: %u", tda->tda_rootpath, buf, strerror(errno), p->frequency); /* Remove from initial scan set */ diff --git a/src/epggrab.c b/src/epggrab.c index 559a3659..ae386947 100644 --- a/src/epggrab.c +++ b/src/epggrab.c @@ -70,7 +70,7 @@ static void _epggrab_module_grab ( epggrab_module_int_t *mod ) /* Process */ if ( data ) { - tvhlog(LOG_INFO, mod->id, "grab took %d seconds", tm2 - tm1); + tvhlog(LOG_INFO, mod->id, "grab took %"PRItime_t" seconds", tm2 - tm1); epggrab_module_parse(mod, data); } else { tvhlog(LOG_WARNING, mod->id, "grab returned no data"); diff --git a/src/epggrab/module.c b/src/epggrab/module.c index d66d2643..facd3f78 100644 --- a/src/epggrab/module.c +++ b/src/epggrab/module.c @@ -120,7 +120,7 @@ void epggrab_module_parse htsmsg_destroy(data); /* Debug stats */ - tvhlog(LOG_INFO, mod->id, "parse took %d seconds", tm2 - tm1); + tvhlog(LOG_INFO, mod->id, "parse took %"PRItime_t" seconds", tm2 - tm1); tvhlog(LOG_INFO, mod->id, " channels tot=%5d new=%5d mod=%5d", stats.channels.total, stats.channels.created, stats.channels.modified); @@ -307,7 +307,7 @@ static void _epggrab_socket_handler ( epggrab_module_ext_t *mod, int s ) /* Process */ if ( data ) { - tvhlog(LOG_INFO, mod->id, "grab took %d seconds", tm2 - tm1); + tvhlog(LOG_INFO, mod->id, "grab took %"PRItime_t" seconds", tm2 - tm1); epggrab_module_parse(mod, data); /* Failed */ diff --git a/src/service.c b/src/service.c index 562d4ac8..b3e31f21 100644 --- a/src/service.c +++ b/src/service.c @@ -339,7 +339,7 @@ service_find(channel_t *ch, unsigned int weight, const char *loginfo, if(t->s_quality_index(t) < 10) { if(loginfo != NULL) { tvhlog(LOG_NOTICE, "Service", - "%s: Skipping \"%s\" -- Quality below 10%", + "%s: Skipping \"%s\" -- Quality below 10%%", loginfo, service_nicename(t)); err = SM_CODE_BAD_SIGNAL; } diff --git a/src/v4l.c b/src/v4l.c index 1de358d3..032ce060 100644 --- a/src/v4l.c +++ b/src/v4l.c @@ -218,7 +218,7 @@ v4l_service_start(service_t *t, unsigned int weight, int force_start) } if(pipe(va->va_pipe)) { tvhlog(LOG_ERR, "v4l", - "%s: Unable to create control pipe", va->va_path, strerror(errno)); + "%s: Unable to create control pipe [%s]", va->va_path, strerror(errno)); close(fd); return -1; } @@ -524,7 +524,7 @@ v4l_adapter_check(const char *path, int fd) path, fmtdesc.index, fmtdesc.description, - &fmtdesc.pixelformat, + (char*)&fmtdesc.pixelformat, fmtdesc.flags & V4L2_FMT_FLAG_COMPRESSED ? "(compressed)" : ""); if(fmtdesc.pixelformat == V4L2_PIX_FMT_MPEG) diff --git a/src/webui/simpleui.c b/src/webui/simpleui.c index 743c72c0..1a74fb14 100644 --- a/src/webui/simpleui.c +++ b/src/webui/simpleui.c @@ -126,7 +126,7 @@ page_simple(http_connection_t *hc, s = epg_episode_get_title(e->episode, lang); htsbuf_qprintf(hq, - "" + "" "%02d:%02d-%02d:%02d %s%s%s
", e->id, a.tm_hour, a.tm_min, b.tm_hour, b.tm_min, @@ -240,7 +240,7 @@ page_einfo(http_connection_t *hc, const char *remain, void *opaque) if((rstatus = val2str(dvr_status, recstatustxt)) != NULL) htsbuf_qprintf(hq, "Recording status: %s
", rstatus); - htsbuf_qprintf(hq, "
", + htsbuf_qprintf(hq, "", e->id); switch(dvr_status) { @@ -408,14 +408,14 @@ page_status(http_connection_t *hc, "" "%02d/%02d/%02d" "" - "%d" - "%d" + "%"PRItime_t"" + "%"PRItime_t"" "" "" "%02d/%02d/%02d" "" - "%d" - "%d" + "%"PRItime_t"" + "%"PRItime_t"" "" "%s", a.tm_year + 1900, a.tm_mon, a.tm_mday, diff --git a/src/webui/webui.c b/src/webui/webui.c index 01d1b669..baa73db1 100644 --- a/src/webui/webui.c +++ b/src/webui/webui.c @@ -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:%d,%s\n", durration, de->de_title); + htsbuf_qprintf(hq, "#EXTINF:%"PRId64",%s\n", durration, de->de_title); - htsbuf_qprintf(hq, "#EXT-X-TARGETDURATION:%d\n", durration); + htsbuf_qprintf(hq, "#EXT-X-TARGETDURATION:%"PRId64"\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:%d,%s\n", durration, de->de_title); + htsbuf_qprintf(hq, "#EXTINF:%"PRId64",%s\n", durration, de->de_title); - htsbuf_qprintf(hq, "#EXT-X-TARGETDURATION:%d\n", durration); + htsbuf_qprintf(hq, "#EXT-X-TARGETDURATION:%"PRId64"\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);