diff --git a/HISTORY b/HISTORY index 691c1e6e..d1e4b8d4 100644 --- a/HISTORY +++ b/HISTORY @@ -9805,3 +9805,4 @@ Video Disk Recorder Revision History to Christoph Haubrich). - Using the frame rate parsed from the stream, with fall back to determining it from PTS values. +- Fixed printing/scanning values for systems where %ld doesn't work for time_t. diff --git a/eit.c b/eit.c index 0d685c5e..478aeb5d 100644 --- a/eit.c +++ b/eit.c @@ -8,7 +8,7 @@ * Robert Schneider and Rolf Hakenes . * Adapted to 'libsi' for VDR 1.3.0 by Marcel Wiesweg . * - * $Id: eit.c 5.4 2021/12/11 20:58:51 kls Exp $ + * $Id: eit.c 5.5 2022/11/22 14:33:48 kls Exp $ */ // The various ways in which broadcasters handle (or screw up) their EPG: @@ -469,7 +469,7 @@ cTDT::cTDT(const u_char *Data) timespec ts = {}; ts.tv_sec = dvbtim; if (clock_settime(CLOCK_REALTIME, &ts) == 0) - isyslog("system time changed from %s (%ld) to %s (%ld)", *TimeToString(loctim), loctim, *TimeToString(dvbtim), dvbtim); + isyslog("system time changed from %s (%jd) to %s (%jd)", *TimeToString(loctim), intmax_t(loctim), *TimeToString(dvbtim), intmax_t(dvbtim)); else esyslog("ERROR while setting system time: %m"); } @@ -479,7 +479,7 @@ cTDT::cTDT(const u_char *Data) delta.tv_sec = diff; delta.tv_usec = 0; if (adjtime(&delta, NULL) == 0) - isyslog("system time adjustment initiated from %s (%ld) to %s (%ld)", *TimeToString(loctim), loctim, *TimeToString(dvbtim), dvbtim); + isyslog("system time adjustment initiated from %s (%jd) to %s (%jd)", *TimeToString(loctim), intmax_t(loctim), *TimeToString(dvbtim), intmax_t(dvbtim)); else esyslog("ERROR while adjusting system time: %m"); } diff --git a/epg.c b/epg.c index d917e669..7c0c9986 100644 --- a/epg.c +++ b/epg.c @@ -7,7 +7,7 @@ * Original version (as used in VDR before 1.3.0) written by * Robert Schneider and Rolf Hakenes . * - * $Id: epg.c 5.6 2021/04/29 09:19:58 kls Exp $ + * $Id: epg.c 5.7 2022/11/22 14:33:48 kls Exp $ */ #include "epg.h" @@ -451,7 +451,7 @@ cString cEvent::GetVpsString(void) const void cEvent::Dump(FILE *f, const char *Prefix, bool InfoOnly) const { if (InfoOnly || startTime + duration + EPG_LINGER_TIME >= time(NULL)) { - fprintf(f, "%sE %u %ld %d %X %X\n", Prefix, eventID, startTime, duration, tableID, version); + fprintf(f, "%sE %u %jd %d %X %X\n", Prefix, eventID, intmax_t(startTime), duration, tableID, version); if (!isempty(title)) fprintf(f, "%sT %s\n", Prefix, title); if (!isempty(shortText)) @@ -476,7 +476,7 @@ void cEvent::Dump(FILE *f, const char *Prefix, bool InfoOnly) const } } if (vps) - fprintf(f, "%sV %ld\n", Prefix, vps); + fprintf(f, "%sV %jd\n", Prefix, intmax_t(vps)); if (!InfoOnly && !isempty(aux)) { strreplace(aux, '\n', '|'); fprintf(f, "%s@ %s\n", Prefix, aux); @@ -518,7 +518,7 @@ bool cEvent::Parse(char *s) components = new cComponents; components->SetComponent(components->NumComponents(), t); break; - case 'V': SetVps(atoi(t)); + case 'V': SetVps(atol(t)); break; case '@': strreplace(t, '|', '\n'); SetAux(t); @@ -541,11 +541,11 @@ bool cEvent::Read(FILE *f, cSchedule *Schedule, int &Line) switch (*s) { case 'E': if (!Event) { unsigned int EventID; - time_t StartTime; + intmax_t StartTime; // actually time_t, but intmax_t for scanning with "%jd" int Duration; unsigned int TableID = 0; unsigned int Version = 0xFF; // actual value is ignored - int n = sscanf(t, "%u %ld %d %X %X", &EventID, &StartTime, &Duration, &TableID, &Version); + int n = sscanf(t, "%u %jd %d %X %X", &EventID, &StartTime, &Duration, &TableID, &Version); if (n >= 3 && n <= 5) { Event = (cEvent *)Schedule->GetEventByTime(StartTime); cEvent *newEvent = NULL; diff --git a/po/ar.po b/po/ar.po index 0eb9749f..84a0e00b 100644 --- a/po/ar.po +++ b/po/ar.po @@ -1547,15 +1547,15 @@ msgid "Recording - shut down anyway?" msgstr "اغلق الحاسوب" #, c-format -msgid "Recording in %ld minutes, shut down anyway?" -msgstr "تم تسجيل %ld دقيقة سيتم الاغلاق على اى حال" +msgid "Recording in %jd minutes, shut down anyway?" +msgstr "تم تسجيل %jd دقيقة سيتم الاغلاق على اى حال" msgid "shut down anyway?" msgstr "الاغلاق على اى حال" #, c-format -msgid "Plugin %s wakes up in %ld min, continue?" -msgstr "Plugin %s wakes up in %ld min, continue?" +msgid "Plugin %s wakes up in %jd min, continue?" +msgstr "Plugin %s wakes up in %jd min, continue?" msgid "Editing - restart anyway?" msgstr "Editing - restart anyway?" diff --git a/po/ca_ES.po b/po/ca_ES.po index e4b4d294..b2e84456 100644 --- a/po/ca_ES.po +++ b/po/ca_ES.po @@ -1546,15 +1546,15 @@ msgid "Recording - shut down anyway?" msgstr "Gravant - Apagar de totes maneres?" #, c-format -msgid "Recording in %ld minutes, shut down anyway?" -msgstr "Hi ha una gravaci en %ld minuts - Apagar de totes maneres?" +msgid "Recording in %jd minutes, shut down anyway?" +msgstr "Hi ha una gravaci en %jd minuts - Apagar de totes maneres?" msgid "shut down anyway?" msgstr "Apagar de totes maneres?" #, c-format -msgid "Plugin %s wakes up in %ld min, continue?" -msgstr "El plugin %s s'activar en %ld minuts, continuar?" +msgid "Plugin %s wakes up in %jd min, continue?" +msgstr "El plugin %s s'activar en %jd minuts, continuar?" msgid "Editing - restart anyway?" msgstr "Editant - Reiniciar de totes maneres?" diff --git a/po/cs_CZ.po b/po/cs_CZ.po index f6a130ce..913add33 100644 --- a/po/cs_CZ.po +++ b/po/cs_CZ.po @@ -1546,15 +1546,15 @@ msgid "Recording - shut down anyway?" msgstr "Systém nahrává - přesto vypnout?" #, c-format -msgid "Recording in %ld minutes, shut down anyway?" -msgstr "Nahrávání začne za %ld minut - přesto vypnout?" +msgid "Recording in %jd minutes, shut down anyway?" +msgstr "Nahrávání začne za %jd minut - přesto vypnout?" msgid "shut down anyway?" msgstr "přesto vypnout?" #, c-format -msgid "Plugin %s wakes up in %ld min, continue?" -msgstr "Modul %s startuje za %ld min., pokračovat?" +msgid "Plugin %s wakes up in %jd min, continue?" +msgstr "Modul %s startuje za %jd min., pokračovat?" msgid "Editing - restart anyway?" msgstr "Edituji - přesto restartovat?" diff --git a/po/da_DK.po b/po/da_DK.po index bc97e29b..d173e448 100644 --- a/po/da_DK.po +++ b/po/da_DK.po @@ -1543,15 +1543,15 @@ msgid "Recording - shut down anyway?" msgstr "Optagelse igang - sluk alligevel?" #, c-format -msgid "Recording in %ld minutes, shut down anyway?" -msgstr "Optagelse om %ld minutter - sluk alligevel?" +msgid "Recording in %jd minutes, shut down anyway?" +msgstr "Optagelse om %jd minutter - sluk alligevel?" msgid "shut down anyway?" msgstr "sluk alligevel?" #, c-format -msgid "Plugin %s wakes up in %ld min, continue?" -msgstr "Plugin %s vgner om %ld min, fortst?" +msgid "Plugin %s wakes up in %jd min, continue?" +msgstr "Plugin %s vgner om %jd min, fortst?" msgid "Editing - restart anyway?" msgstr "Redigering igang - genstart alligevel?" diff --git a/po/de_DE.po b/po/de_DE.po index 1be50aca..9f53b868 100644 --- a/po/de_DE.po +++ b/po/de_DE.po @@ -1544,15 +1544,15 @@ msgid "Recording - shut down anyway?" msgstr "Aufnahme luft - trotzdem ausschalten?" #, c-format -msgid "Recording in %ld minutes, shut down anyway?" -msgstr "Aufnahme in %ld Minuten - trotzdem ausschalten?" +msgid "Recording in %jd minutes, shut down anyway?" +msgstr "Aufnahme in %jd Minuten - trotzdem ausschalten?" msgid "shut down anyway?" msgstr "trotzdem ausschalten?" #, c-format -msgid "Plugin %s wakes up in %ld min, continue?" -msgstr "Plugin %s wacht in %ld Min auf, weiter?" +msgid "Plugin %s wakes up in %jd min, continue?" +msgstr "Plugin %s wacht in %jd Min auf, weiter?" msgid "Editing - restart anyway?" msgstr "Bearbeitung luft - trotzdem neu starten?" diff --git a/po/el_GR.po b/po/el_GR.po index c0841ada..bc5a07e6 100644 --- a/po/el_GR.po +++ b/po/el_GR.po @@ -1543,14 +1543,14 @@ msgid "Recording - shut down anyway?" msgstr " - ?" #, c-format -msgid "Recording in %ld minutes, shut down anyway?" -msgstr " %ld - ?" +msgid "Recording in %jd minutes, shut down anyway?" +msgstr " %jd - ?" msgid "shut down anyway?" msgstr " ?" #, c-format -msgid "Plugin %s wakes up in %ld min, continue?" +msgid "Plugin %s wakes up in %jd min, continue?" msgstr "" msgid "Editing - restart anyway?" diff --git a/po/es_ES.po b/po/es_ES.po index bda97f0b..22589fbd 100644 --- a/po/es_ES.po +++ b/po/es_ES.po @@ -1544,15 +1544,15 @@ msgid "Recording - shut down anyway?" msgstr "Grabacin en curso - apagar igualmente?" #, c-format -msgid "Recording in %ld minutes, shut down anyway?" -msgstr "Grabacin dentro de %ld minutos, apagar igualmente?" +msgid "Recording in %jd minutes, shut down anyway?" +msgstr "Grabacin dentro de %jd minutos, apagar igualmente?" msgid "shut down anyway?" msgstr "apagar igualmente?" #, c-format -msgid "Plugin %s wakes up in %ld min, continue?" -msgstr "Plugin %s inicia en %ld min, continuar?" +msgid "Plugin %s wakes up in %jd min, continue?" +msgstr "Plugin %s inicia en %jd min, continuar?" msgid "Editing - restart anyway?" msgstr "Editando - reiniciar igualmente?" diff --git a/po/et_EE.po b/po/et_EE.po index 27d4e62a..e3744758 100644 --- a/po/et_EE.po +++ b/po/et_EE.po @@ -1543,15 +1543,15 @@ msgid "Recording - shut down anyway?" msgstr "Salvestamine aktiivne - lülitada välja?" #, c-format -msgid "Recording in %ld minutes, shut down anyway?" -msgstr "Salvestamine algab %ld minuti pärast - lülitada välja?" +msgid "Recording in %jd minutes, shut down anyway?" +msgstr "Salvestamine algab %jd minuti pärast - lülitada välja?" msgid "shut down anyway?" msgstr "lülitada välja?" #, c-format -msgid "Plugin %s wakes up in %ld min, continue?" -msgstr "Plugin %s ärkab %ld minuti pärast, jätkata?" +msgid "Plugin %s wakes up in %jd min, continue?" +msgstr "Plugin %s ärkab %jd minuti pärast, jätkata?" msgid "Editing - restart anyway?" msgstr "Töötlemine aktiivne - taaskäivitada?" diff --git a/po/fi_FI.po b/po/fi_FI.po index ba49173e..2ed11bd8 100644 --- a/po/fi_FI.po +++ b/po/fi_FI.po @@ -1547,15 +1547,15 @@ msgid "Recording - shut down anyway?" msgstr "Tallennus kesken - sammutetaanko?" #, c-format -msgid "Recording in %ld minutes, shut down anyway?" -msgstr "Tallennus alkaa %ld min kuluttua - sammutetaanko?" +msgid "Recording in %jd minutes, shut down anyway?" +msgstr "Tallennus alkaa %jd min kuluttua - sammutetaanko?" msgid "shut down anyway?" msgstr "sammutetaanko?" #, c-format -msgid "Plugin %s wakes up in %ld min, continue?" -msgstr "Laajennos %s herää %ld minuutin kuluttua - sammutetaanko?" +msgid "Plugin %s wakes up in %jd min, continue?" +msgstr "Laajennos %s herää %jd minuutin kuluttua - sammutetaanko?" msgid "Editing - restart anyway?" msgstr "Muokkaus kesken - käynnistetäänkö uudelleen?" diff --git a/po/fr_FR.po b/po/fr_FR.po index c20178f5..bef9457d 100644 --- a/po/fr_FR.po +++ b/po/fr_FR.po @@ -1554,15 +1554,15 @@ msgid "Recording - shut down anyway?" msgstr "Enregistrement en cours - confirmer l'arrêt ?" #, c-format -msgid "Recording in %ld minutes, shut down anyway?" -msgstr "Enregistrement dans %ld minutes - confirmer l'arrêt ?" +msgid "Recording in %jd minutes, shut down anyway?" +msgstr "Enregistrement dans %jd minutes - confirmer l'arrêt ?" msgid "shut down anyway?" msgstr "confirmer l'arrêt ?" #, c-format -msgid "Plugin %s wakes up in %ld min, continue?" -msgstr "Le plugin %s démarre dans %ld min, continuer ?" +msgid "Plugin %s wakes up in %jd min, continue?" +msgstr "Le plugin %s démarre dans %jd min, continuer ?" msgid "Editing - restart anyway?" msgstr "Édition en cours - confirmer redémarrage ?" diff --git a/po/hr_HR.po b/po/hr_HR.po index e368ffc4..6dc7daf6 100644 --- a/po/hr_HR.po +++ b/po/hr_HR.po @@ -1545,15 +1545,15 @@ msgid "Recording - shut down anyway?" msgstr "Snimanje traje - iskljuiti unato?" #, c-format -msgid "Recording in %ld minutes, shut down anyway?" -msgstr "Snimanje za %ld minuta - iskljuiti unato?" +msgid "Recording in %jd minutes, shut down anyway?" +msgstr "Snimanje za %jd minuta - iskljuiti unato?" msgid "shut down anyway?" msgstr "svejedno iskljuiti?" #, c-format -msgid "Plugin %s wakes up in %ld min, continue?" -msgstr "Dodatak %s se budi u %ld min, nastavi?" +msgid "Plugin %s wakes up in %jd min, continue?" +msgstr "Dodatak %s se budi u %jd min, nastavi?" msgid "Editing - restart anyway?" msgstr "Ureivanje u tijeku - ponovno pokreni unato?" diff --git a/po/hu_HU.po b/po/hu_HU.po index cef5e4e1..9595f84a 100644 --- a/po/hu_HU.po +++ b/po/hu_HU.po @@ -1548,15 +1548,15 @@ msgid "Recording - shut down anyway?" msgstr "Felvétel folyamatban - mégis leállítani?" #, c-format -msgid "Recording in %ld minutes, shut down anyway?" -msgstr "Felvétel %ld perc múlva kezdődik - mégis leállítani?" +msgid "Recording in %jd minutes, shut down anyway?" +msgstr "Felvétel %jd perc múlva kezdődik - mégis leállítani?" msgid "shut down anyway?" msgstr "mégis leállítani?" #, c-format -msgid "Plugin %s wakes up in %ld min, continue?" -msgstr "A(z) %s plugin ébreszt %ld perc múlva, folytatni?" +msgid "Plugin %s wakes up in %jd min, continue?" +msgstr "A(z) %s plugin ébreszt %jd perc múlva, folytatni?" msgid "Editing - restart anyway?" msgstr "Szerkesztés folyamatban - mégis újraindítani?" diff --git a/po/it_IT.po b/po/it_IT.po index 5d5d0950..416f40f9 100644 --- a/po/it_IT.po +++ b/po/it_IT.po @@ -1549,15 +1549,15 @@ msgid "Recording - shut down anyway?" msgstr "Registrazione in corso - spegnere comunque?" #, c-format -msgid "Recording in %ld minutes, shut down anyway?" -msgstr "Registrazione tra %ld minuti - spegnere comunque?" +msgid "Recording in %jd minutes, shut down anyway?" +msgstr "Registrazione tra %jd minuti - spegnere comunque?" msgid "shut down anyway?" msgstr "spegnere comunque?" #, c-format -msgid "Plugin %s wakes up in %ld min, continue?" -msgstr "Il plugin %s si ripristina tra %ld min, continuare?" +msgid "Plugin %s wakes up in %jd min, continue?" +msgstr "Il plugin %s si ripristina tra %jd min, continuare?" msgid "Editing - restart anyway?" msgstr "Modifica in corso - riavviare comunque?" diff --git a/po/lt_LT.po b/po/lt_LT.po index 03565d0d..92d4516c 100644 --- a/po/lt_LT.po +++ b/po/lt_LT.po @@ -1543,15 +1543,15 @@ msgid "Recording - shut down anyway?" msgstr "Įrašinėjama - išjungti vistiek?" #, c-format -msgid "Recording in %ld minutes, shut down anyway?" -msgstr "Įrašas prasidės po %ld minučių, išjungti vistiek?" +msgid "Recording in %jd minutes, shut down anyway?" +msgstr "Įrašas prasidės po %jd minučių, išjungti vistiek?" msgid "shut down anyway?" msgstr "išjungti bet kokiu atveju?" #, c-format -msgid "Plugin %s wakes up in %ld min, continue?" -msgstr "Įskiepas %s aktyvuosis po %ld min, tęsti toliau?" +msgid "Plugin %s wakes up in %jd min, continue?" +msgstr "Įskiepas %s aktyvuosis po %jd min, tęsti toliau?" msgid "Editing - restart anyway?" msgstr "Koreguojama - perkrauti vistiek?" diff --git a/po/mk_MK.po b/po/mk_MK.po index f090c636..0096fc7d 100644 --- a/po/mk_MK.po +++ b/po/mk_MK.po @@ -1545,15 +1545,15 @@ msgid "Recording - shut down anyway?" msgstr "Снимање во тек - исклучи?" #, c-format -msgid "Recording in %ld minutes, shut down anyway?" -msgstr "Снимање уште %ld минути - исклучи?" +msgid "Recording in %jd minutes, shut down anyway?" +msgstr "Снимање уште %jd минути - исклучи?" msgid "shut down anyway?" msgstr "сеедно исклучи?" #, c-format -msgid "Plugin %s wakes up in %ld min, continue?" -msgstr "Додатокот %s се подига за %ld мин, продолжи?" +msgid "Plugin %s wakes up in %jd min, continue?" +msgstr "Додатокот %s се подига за %jd мин, продолжи?" msgid "Editing - restart anyway?" msgstr "Уредување во тек - рестартирај?" diff --git a/po/nl_NL.po b/po/nl_NL.po index 442bf6a6..eb7da10e 100644 --- a/po/nl_NL.po +++ b/po/nl_NL.po @@ -1549,15 +1549,15 @@ msgid "Recording - shut down anyway?" msgstr "Opname loopt - toch uitschakelen?" #, c-format -msgid "Recording in %ld minutes, shut down anyway?" -msgstr "Opname in %ld minuten - toch uitschakelen?" +msgid "Recording in %jd minutes, shut down anyway?" +msgstr "Opname in %jd minuten - toch uitschakelen?" msgid "shut down anyway?" msgstr "toch uitschakelen?" #, c-format -msgid "Plugin %s wakes up in %ld min, continue?" -msgstr "Plugin %s wordt binnen %ld min. aktief, doorgaan?" +msgid "Plugin %s wakes up in %jd min, continue?" +msgstr "Plugin %s wordt binnen %jd min. aktief, doorgaan?" msgid "Editing - restart anyway?" msgstr "Bewerken aktief - toch herstarten?" diff --git a/po/nn_NO.po b/po/nn_NO.po index 77bf81a6..f6c15fca 100644 --- a/po/nn_NO.po +++ b/po/nn_NO.po @@ -1544,14 +1544,14 @@ msgid "Recording - shut down anyway?" msgstr "Gjr opptak - sl av likevel?" #, c-format -msgid "Recording in %ld minutes, shut down anyway?" -msgstr "Skal gjre opptak om %ld minutter - sl av likevel?" +msgid "Recording in %jd minutes, shut down anyway?" +msgstr "Skal gjre opptak om %jd minutter - sl av likevel?" msgid "shut down anyway?" msgstr "sl av likevel?" #, c-format -msgid "Plugin %s wakes up in %ld min, continue?" +msgid "Plugin %s wakes up in %jd min, continue?" msgstr "" msgid "Editing - restart anyway?" diff --git a/po/pl_PL.po b/po/pl_PL.po index b67fd137..ae3b935a 100644 --- a/po/pl_PL.po +++ b/po/pl_PL.po @@ -1548,15 +1548,15 @@ msgid "Recording - shut down anyway?" msgstr "Trwa nagrywanie - wyłączyć mimo to?" #, c-format -msgid "Recording in %ld minutes, shut down anyway?" -msgstr "Nagrywanie za %ld minut - wyłączyć mimo to?" +msgid "Recording in %jd minutes, shut down anyway?" +msgstr "Nagrywanie za %jd minut - wyłączyć mimo to?" msgid "shut down anyway?" msgstr "wyłączyć mimo to?" #, c-format -msgid "Plugin %s wakes up in %ld min, continue?" -msgstr "Wtyczka %s obudzi się za %ld min, kontynuować?" +msgid "Plugin %s wakes up in %jd min, continue?" +msgstr "Wtyczka %s obudzi się za %jd min, kontynuować?" msgid "Editing - restart anyway?" msgstr "Montaż w trakcie - Zrestartować mimo to?" diff --git a/po/pt_PT.po b/po/pt_PT.po index f72f1f45..35e909e8 100644 --- a/po/pt_PT.po +++ b/po/pt_PT.po @@ -1544,15 +1544,15 @@ msgid "Recording - shut down anyway?" msgstr "A gravar - desligar mesmo assim?" #, c-format -msgid "Recording in %ld minutes, shut down anyway?" -msgstr "Gravao programada em %ld minutos - desligar mesmo assim?" +msgid "Recording in %jd minutes, shut down anyway?" +msgstr "Gravao programada em %jd minutos - desligar mesmo assim?" msgid "shut down anyway?" msgstr "desligar mesmo assim?" #, c-format -msgid "Plugin %s wakes up in %ld min, continue?" -msgstr "O plugin %s acorda daqui a %ld minuots, continuar?" +msgid "Plugin %s wakes up in %jd min, continue?" +msgstr "O plugin %s acorda daqui a %jd minuots, continuar?" msgid "Editing - restart anyway?" msgstr "A editar - reiniciar mesmo assim?" diff --git a/po/ro_RO.po b/po/ro_RO.po index 8e82aae2..9f7ffdb9 100644 --- a/po/ro_RO.po +++ b/po/ro_RO.po @@ -1545,15 +1545,15 @@ msgid "Recording - shut down anyway?" msgstr "Tocmai se înregistrează - închid, totuşi?" #, c-format -msgid "Recording in %ld minutes, shut down anyway?" -msgstr "Înregistrez peste %ld minute - închid, totuşi?" +msgid "Recording in %jd minutes, shut down anyway?" +msgstr "Înregistrez peste %jd minute - închid, totuşi?" msgid "shut down anyway?" msgstr "închid, totuşi?" #, c-format -msgid "Plugin %s wakes up in %ld min, continue?" -msgstr "Plugin-ul %s se va trezi +n %ld min, continui?" +msgid "Plugin %s wakes up in %jd min, continue?" +msgstr "Plugin-ul %s se va trezi +n %jd min, continui?" msgid "Editing - restart anyway?" msgstr "Editarea tocmai se efectuează - repornesc, totuşi?" diff --git a/po/ru_RU.po b/po/ru_RU.po index 283354d3..496287dc 100644 --- a/po/ru_RU.po +++ b/po/ru_RU.po @@ -1544,15 +1544,15 @@ msgid "Recording - shut down anyway?" msgstr "Идёт запись - действительно выключить?" #, c-format -msgid "Recording in %ld minutes, shut down anyway?" -msgstr "Через %ld минут начнётся запись - действительно выключить?" +msgid "Recording in %jd minutes, shut down anyway?" +msgstr "Через %jd минут начнётся запись - действительно выключить?" msgid "shut down anyway?" msgstr "действительно выключить?" #, c-format -msgid "Plugin %s wakes up in %ld min, continue?" -msgstr "Plugin %s проснется через %ld минут - продолжить?" +msgid "Plugin %s wakes up in %jd min, continue?" +msgstr "Plugin %s проснется через %jd минут - продолжить?" msgid "Editing - restart anyway?" msgstr "Процесс монтажа - действительно перезапустить?" diff --git a/po/sk_SK.po b/po/sk_SK.po index 69e2588d..09d0a1a8 100644 --- a/po/sk_SK.po +++ b/po/sk_SK.po @@ -1544,15 +1544,15 @@ msgid "Recording - shut down anyway?" msgstr "Nahrva - aj tak vypn?" #, c-format -msgid "Recording in %ld minutes, shut down anyway?" -msgstr "Nahrvanie zane za %ld mint - aj tak vypn?" +msgid "Recording in %jd minutes, shut down anyway?" +msgstr "Nahrvanie zane za %jd mint - aj tak vypn?" msgid "shut down anyway?" msgstr "Urite vypn?" #, c-format -msgid "Plugin %s wakes up in %ld min, continue?" -msgstr "Modul %s sa prebud za %ld min., pokraova?" +msgid "Plugin %s wakes up in %jd min, continue?" +msgstr "Modul %s sa prebud za %jd min., pokraova?" msgid "Editing - restart anyway?" msgstr "Upravuje sa - aj tak retartova?" diff --git a/po/sl_SI.po b/po/sl_SI.po index d631331e..2749a592 100644 --- a/po/sl_SI.po +++ b/po/sl_SI.po @@ -1544,15 +1544,15 @@ msgid "Recording - shut down anyway?" msgstr "Snemanje - zares izklopi?" #, c-format -msgid "Recording in %ld minutes, shut down anyway?" -msgstr "Snemanje ez %ld minut, zares izklopi?" +msgid "Recording in %jd minutes, shut down anyway?" +msgstr "Snemanje ez %jd minut, zares izklopi?" msgid "shut down anyway?" msgstr "zares izklopi?" #, c-format -msgid "Plugin %s wakes up in %ld min, continue?" -msgstr "Vstavek %s se zbudi v %ld min, nadaljuj?" +msgid "Plugin %s wakes up in %jd min, continue?" +msgstr "Vstavek %s se zbudi v %jd min, nadaljuj?" msgid "Editing - restart anyway?" msgstr "Urejanje - zares ponoven zagon?" diff --git a/po/sr_RS.po b/po/sr_RS.po index 9acdcb67..7cbbe57e 100644 --- a/po/sr_RS.po +++ b/po/sr_RS.po @@ -1544,15 +1544,15 @@ msgid "Recording - shut down anyway?" msgstr "Snimanje u toku - svejedno iskljui?" #, c-format -msgid "Recording in %ld minutes, shut down anyway?" -msgstr "Snimanje za %ld minuta - svejedno iskljui?" +msgid "Recording in %jd minutes, shut down anyway?" +msgstr "Snimanje za %jd minuta - svejedno iskljui?" msgid "shut down anyway?" msgstr "svejedno iskljui?" #, c-format -msgid "Plugin %s wakes up in %ld min, continue?" -msgstr "Dodatak %s se budi za %ld min, nastavi?" +msgid "Plugin %s wakes up in %jd min, continue?" +msgstr "Dodatak %s se budi za %jd min, nastavi?" msgid "Editing - restart anyway?" msgstr "Ureivanje u toku - svejedno ponovno pokreni?" diff --git a/po/sv_SE.po b/po/sv_SE.po index e4cefbbf..75973c33 100644 --- a/po/sv_SE.po +++ b/po/sv_SE.po @@ -1548,15 +1548,15 @@ msgid "Recording - shut down anyway?" msgstr "Inspelning pgr, vill du avsluta nd?" #, c-format -msgid "Recording in %ld minutes, shut down anyway?" -msgstr "Inspelning startar om %ld minuter, vill du avsluta nd?" +msgid "Recording in %jd minutes, shut down anyway?" +msgstr "Inspelning startar om %jd minuter, vill du avsluta nd?" msgid "shut down anyway?" msgstr "vill du avsluta nd?" #, c-format -msgid "Plugin %s wakes up in %ld min, continue?" -msgstr "Plugin %s aktiv om %ld min, vill du fortstta?" +msgid "Plugin %s wakes up in %jd min, continue?" +msgstr "Plugin %s aktiv om %jd min, vill du fortstta?" msgid "Editing - restart anyway?" msgstr "Editering pgr, vill du starta om nd?" diff --git a/po/tr_TR.po b/po/tr_TR.po index 47a053f5..130b98da 100644 --- a/po/tr_TR.po +++ b/po/tr_TR.po @@ -1543,15 +1543,15 @@ msgid "Recording - shut down anyway?" msgstr "Kayt ediliyor - buna ramen kapat?" #, c-format -msgid "Recording in %ld minutes, shut down anyway?" -msgstr "Kayt %ld dakikada balyor - buna ramen kapat?" +msgid "Recording in %jd minutes, shut down anyway?" +msgstr "Kayt %jd dakikada balyor - buna ramen kapat?" msgid "shut down anyway?" msgstr "buna ramen kapat?" #, c-format -msgid "Plugin %s wakes up in %ld min, continue?" -msgstr "Eklenti %s %ld dakikada alyor, devam et?" +msgid "Plugin %s wakes up in %jd min, continue?" +msgstr "Eklenti %s %jd dakikada alyor, devam et?" msgid "Editing - restart anyway?" msgstr "Kesim aktif - buna ramen yeniden balat?" diff --git a/po/uk_UA.po b/po/uk_UA.po index a096260b..a6c422de 100644 --- a/po/uk_UA.po +++ b/po/uk_UA.po @@ -1544,15 +1544,15 @@ msgid "Recording - shut down anyway?" msgstr "Йде запис - дійсно виключити?" #, c-format -msgid "Recording in %ld minutes, shut down anyway?" -msgstr "Через %ld хвилин почнеться запис - дійсно виключити?" +msgid "Recording in %jd minutes, shut down anyway?" +msgstr "Через %jd хвилин почнеться запис - дійсно виключити?" msgid "shut down anyway?" msgstr "дійсно виключити?" #, c-format -msgid "Plugin %s wakes up in %ld min, continue?" -msgstr "Модуль %s включиться через %ld хвилин - продовжити?" +msgid "Plugin %s wakes up in %jd min, continue?" +msgstr "Модуль %s включиться через %jd хвилин - продовжити?" msgid "Editing - restart anyway?" msgstr "Процес монтажу - дійсно перезапустити?" diff --git a/po/zh_CN.po b/po/zh_CN.po index a953441d..4527de22 100644 --- a/po/zh_CN.po +++ b/po/zh_CN.po @@ -1545,15 +1545,15 @@ msgid "Recording - shut down anyway?" msgstr "录像中,是否立即关机?" #, c-format -msgid "Recording in %ld minutes, shut down anyway?" -msgstr "录像已有 %ld 分钟,立即关机?" +msgid "Recording in %jd minutes, shut down anyway?" +msgstr "录像已有 %jd 分钟,立即关机?" msgid "shut down anyway?" msgstr "是否立即关机?" #, c-format -msgid "Plugin %s wakes up in %ld min, continue?" -msgstr "插件 %s 唤醒在 %ld 分钟,是否继续?" +msgid "Plugin %s wakes up in %jd min, continue?" +msgstr "插件 %s 唤醒在 %jd 分钟,是否继续?" msgid "Editing - restart anyway?" msgstr "编辑中,是否现在重启?" diff --git a/recording.c b/recording.c index 35bd2479..be9ce548 100644 --- a/recording.c +++ b/recording.c @@ -4,7 +4,7 @@ * See the main source file 'vdr.c' for copyright information and * how to reach the author. * - * $Id: recording.c 5.17 2022/11/13 15:20:42 kls Exp $ + * $Id: recording.c 5.18 2022/11/22 14:33:48 kls Exp $ */ #include "recording.h" @@ -485,11 +485,11 @@ bool cRecordingInfo::Read(FILE *f) break; case 'E': { unsigned int EventID; - time_t StartTime; + intmax_t StartTime; // actually time_t, but intmax_t for scanning with "%jd" int Duration; unsigned int TableID = 0; unsigned int Version = 0xFF; - int n = sscanf(t, "%u %ld %d %X %X", &EventID, &StartTime, &Duration, &TableID, &Version); + int n = sscanf(t, "%u %jd %d %X %X", &EventID, &StartTime, &Duration, &TableID, &Version); if (n >= 3 && n <= 5) { ownEvent->SetEventID(EventID); ownEvent->SetStartTime(StartTime); diff --git a/shutdown.c b/shutdown.c index 1fb0394b..7e170a04 100644 --- a/shutdown.c +++ b/shutdown.c @@ -6,7 +6,7 @@ * * Original version written by Udo Richter . * - * $Id: shutdown.c 4.2 2018/03/23 15:39:21 kls Exp $ + * $Id: shutdown.c 5.1 2022/11/22 14:33:48 kls Exp $ */ #include "shutdown.h" @@ -113,7 +113,7 @@ void cShutdownHandler::CheckManualStart(int ManualStart) } else { // Set inactive from now on - dsyslog("scheduled wakeup time in %ld minutes, assuming automatic start of VDR", Delta / 60); + dsyslog("scheduled wakeup time in %jd minutes, assuming automatic start of VDR", intmax_t(Delta / 60)); SetUserInactiveTimeout(-3, true); } } @@ -127,7 +127,7 @@ void cShutdownHandler::SetShutdownCommand(const char *ShutdownCommand) void cShutdownHandler::CallShutdownCommand(time_t WakeupTime, int Channel, const char *File, bool UserShutdown) { time_t Delta = WakeupTime ? WakeupTime - time(NULL) : 0; - cString cmd = cString::sprintf("%s %ld %ld %d \"%s\" %d", shutdownCommand, WakeupTime, Delta, Channel, *strescape(File, "\\\"$"), UserShutdown); + cString cmd = cString::sprintf("%s %jd %jd %d \"%s\" %d", shutdownCommand, intmax_t(WakeupTime), intmax_t(Delta), Channel, *strescape(File, "\\\"$"), UserShutdown); isyslog("executing '%s'", *cmd); int Status = SystemExec(cmd, true); if (!WIFEXITED(Status) || WEXITSTATUS(Status)) @@ -183,7 +183,7 @@ bool cShutdownHandler::ConfirmShutdown(bool Interactive) // Timer within Min Event Timeout if (!Interactive) return false; - cString buf = cString::sprintf(tr("Recording in %ld minutes, shut down anyway?"), Delta / 60); + cString buf = cString::sprintf(tr("Recording in %jd minutes, shut down anyway?"), intmax_t(Delta / 60)); if (!Interface->Confirm(buf)) return false; } @@ -198,7 +198,7 @@ bool cShutdownHandler::ConfirmShutdown(bool Interactive) // Plugin wakeup within Min Event Timeout if (!Interactive) return false; - cString buf = cString::sprintf(tr("Plugin %s wakes up in %ld min, continue?"), Plugin->Name(), Delta / 60); + cString buf = cString::sprintf(tr("Plugin %s wakes up in %jd min, continue?"), Plugin->Name(), intmax_t(Delta / 60)); if (!Interface->Confirm(buf)) return false; } diff --git a/svdrp.c b/svdrp.c index 0332512d..962a8b99 100644 --- a/svdrp.c +++ b/svdrp.c @@ -10,7 +10,7 @@ * and interact with the Video Disk Recorder - or write a full featured * graphical interface that sits on top of an SVDRP connection. * - * $Id: svdrp.c 5.5 2022/11/19 15:49:27 kls Exp $ + * $Id: svdrp.c 5.6 2022/11/22 14:33:48 kls Exp $ */ #include "svdrp.h" @@ -2230,9 +2230,9 @@ void cSVDRPServer::CmdNEXT(const char *Option) if (!*Option) Reply(250, "%d %s", Id, *TimeToString(Start)); else if (strcasecmp(Option, "ABS") == 0) - Reply(250, "%d %ld", Id, Start); + Reply(250, "%d %jd", Id, intmax_t(Start)); else if (strcasecmp(Option, "REL") == 0) - Reply(250, "%d %ld", Id, Start - time(NULL)); + Reply(250, "%d %jd", Id, intmax_t(Start - time(NULL))); else Reply(501, "Unknown option: \"%s\"", Option); } diff --git a/tools.c b/tools.c index 86c63eb4..d04033b1 100644 --- a/tools.c +++ b/tools.c @@ -4,7 +4,7 @@ * See the main source file 'vdr.c' for copyright information and * how to reach the author. * - * $Id: tools.c 5.6 2022/11/04 14:30:01 kls Exp $ + * $Id: tools.c 5.7 2022/11/22 14:33:48 kls Exp $ */ #include "tools.h" @@ -767,7 +767,7 @@ uint64_t cTimeMs::Now(void) esyslog("cTimeMs: clock_gettime(CLOCK_MONOTONIC) failed"); } else - dsyslog("cTimeMs: not using monotonic clock - resolution is too bad (%ld s %ld ns)", tp.tv_sec, tp.tv_nsec); + dsyslog("cTimeMs: not using monotonic clock - resolution is too bad (%jd s %ld ns)", intmax_t(tp.tv_sec), tp.tv_nsec); } else esyslog("cTimeMs: clock_getres(CLOCK_MONOTONIC) failed");