Address two splint-related TODOs.

This commit is contained in:
Andrew Wood
2024-12-08 17:31:59 +00:00
parent 269d2f5729
commit 5c5d53e1d1
12 changed files with 114 additions and 125 deletions
+14 -14
View File
@@ -1,7 +1,7 @@
msgid ""
msgstr ""
"Report-Msgid-Bugs-To: pv@ivarch.com\n"
"POT-Creation-Date: 2024-12-08 17:13+0000\n"
"POT-Creation-Date: 2024-12-08 17:31+0000\n"
"PO-Revision-Date: 2024-10-13 20:43+0000\n"
"Last-Translator: mmatous <mmatous@users.noreply.translate.codeberg.org>\n"
"Language-Team: Czech <https://translate.codeberg.org/projects/pv/pv/cs/>\n"
@@ -429,11 +429,11 @@ msgstr "FIN"
msgid "b"
msgstr "b"
#: src/pv/display.c:956 src/pv/transfer.c:602
#: src/pv/display.c:956 src/pv/transfer.c:594
msgid "B"
msgstr "B"
#: src/pv/display.c:1497 src/pv/transfer.c:1064
#: src/pv/display.c:1497 src/pv/transfer.c:1056
msgid "buffer allocation failed"
msgstr "selhala alokace vyrovnávací paměti"
@@ -489,47 +489,47 @@ msgstr "selhala alokace struktury historie"
msgid "file list allocation failed"
msgstr "selhala alokace seznamu souborů"
#: src/pv/transfer.c:464
#: src/pv/transfer.c:463
msgid "read failed"
msgstr "čtení selhalo"
#: src/pv/transfer.c:487
#: src/pv/transfer.c:479
msgid "warning: read errors detected"
msgstr "varování: detekovány chyby při čtení"
#: src/pv/transfer.c:503
#: src/pv/transfer.c:495
msgid "file is not seekable"
msgstr "souborem nelze procházet"
#: src/pv/transfer.c:581
#: src/pv/transfer.c:573
msgid "failed to seek past error"
msgstr "selhal skok za chybu"
#: src/pv/transfer.c:601
#: src/pv/transfer.c:593
msgid "skipped past read error"
msgstr "chyba přeskočena"
#: src/pv/transfer.c:642
#: src/pv/transfer.c:634
msgid "no transfer buffer allocated"
msgstr "vyrovnávací paměť není alokována"
#: src/pv/transfer.c:684
#: src/pv/transfer.c:676
msgid "failed to set interval timer"
msgstr "selhalo nastavení intervalového časovače"
#: src/pv/transfer.c:710
#: src/pv/transfer.c:702
msgid "failed to clear interval timer"
msgstr "selhalo vynulování intervalového časovače"
#: src/pv/transfer.c:752
#: src/pv/transfer.c:744
msgid "line position buffer allocation failed"
msgstr "selhala alokace vyrovnávací paměti pro pozici v řádcích"
#: src/pv/transfer.c:925
#: src/pv/transfer.c:917
msgid "write failed"
msgstr "zápis selhal"
#: src/pv/transfer.c:1162
#: src/pv/transfer.c:1154
msgid "select call failed"
msgstr "selhalo volání select"
+14 -14
View File
@@ -1,7 +1,7 @@
msgid ""
msgstr ""
"Report-Msgid-Bugs-To: pv@ivarch.com\n"
"POT-Creation-Date: 2024-12-08 17:13+0000\n"
"POT-Creation-Date: 2024-12-08 17:31+0000\n"
"PO-Revision-Date: 2024-10-13 20:43+0000\n"
"Last-Translator: fnetX <otto@codeberg.org>\n"
"Language-Team: German <https://translate.codeberg.org/projects/pv/pv/de/>\n"
@@ -452,11 +452,11 @@ msgstr "Endzeit"
msgid "b"
msgstr "b"
#: src/pv/display.c:956 src/pv/transfer.c:602
#: src/pv/display.c:956 src/pv/transfer.c:594
msgid "B"
msgstr "B"
#: src/pv/display.c:1497 src/pv/transfer.c:1064
#: src/pv/display.c:1497 src/pv/transfer.c:1056
msgid "buffer allocation failed"
msgstr "Speicherzuweisung für den Puffer fehlgeschlagen"
@@ -513,47 +513,47 @@ msgstr "Speicherzuweisung für `history' fehlgeschlagen"
msgid "file list allocation failed"
msgstr "Speicherzuweisung für die Dateiliste fehlgeschlagen"
#: src/pv/transfer.c:464
#: src/pv/transfer.c:463
msgid "read failed"
msgstr "read-Aufruf fehlgeschlagen"
#: src/pv/transfer.c:487
#: src/pv/transfer.c:479
msgid "warning: read errors detected"
msgstr "warnung: lesefehler erkannt"
#: src/pv/transfer.c:503
#: src/pv/transfer.c:495
msgid "file is not seekable"
msgstr "Datei ist nicht durchsuchbar"
#: src/pv/transfer.c:581
#: src/pv/transfer.c:573
msgid "failed to seek past error"
msgstr "konnte den Fehler nicht überwinden"
#: src/pv/transfer.c:601
#: src/pv/transfer.c:593
msgid "skipped past read error"
msgstr "über den Lesefehler hinaus verschoben"
#: src/pv/transfer.c:642
#: src/pv/transfer.c:634
msgid "no transfer buffer allocated"
msgstr "Speicherzuweisung für den Transferpuffer fehlgeschlagen"
#: src/pv/transfer.c:684
#: src/pv/transfer.c:676
msgid "failed to set interval timer"
msgstr "konnte Intervall-Timer nicht setzen"
#: src/pv/transfer.c:710
#: src/pv/transfer.c:702
msgid "failed to clear interval timer"
msgstr "konnte Intervall-Timer nicht löschen"
#: src/pv/transfer.c:752
#: src/pv/transfer.c:744
msgid "line position buffer allocation failed"
msgstr "Zuweisung des Zeilenpuffers fehlgeschlagen"
#: src/pv/transfer.c:925
#: src/pv/transfer.c:917
msgid "write failed"
msgstr "write-Aufruf fehlgeschlagen"
#: src/pv/transfer.c:1162
#: src/pv/transfer.c:1154
msgid "select call failed"
msgstr "select-Aufruf fehlgeschlagen"
+14 -14
View File
@@ -1,7 +1,7 @@
msgid ""
msgstr ""
"Report-Msgid-Bugs-To: pv@ivarch.com\n"
"POT-Creation-Date: 2024-12-08 17:13+0000\n"
"POT-Creation-Date: 2024-12-08 17:31+0000\n"
"Language: es\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -421,11 +421,11 @@ msgstr ""
msgid "b"
msgstr ""
#: src/pv/display.c:956 src/pv/transfer.c:602
#: src/pv/display.c:956 src/pv/transfer.c:594
msgid "B"
msgstr ""
#: src/pv/display.c:1497 src/pv/transfer.c:1064
#: src/pv/display.c:1497 src/pv/transfer.c:1056
msgid "buffer allocation failed"
msgstr ""
@@ -481,47 +481,47 @@ msgstr ""
msgid "file list allocation failed"
msgstr ""
#: src/pv/transfer.c:464
#: src/pv/transfer.c:463
msgid "read failed"
msgstr ""
#: src/pv/transfer.c:487
#: src/pv/transfer.c:479
msgid "warning: read errors detected"
msgstr ""
#: src/pv/transfer.c:503
#: src/pv/transfer.c:495
msgid "file is not seekable"
msgstr ""
#: src/pv/transfer.c:581
#: src/pv/transfer.c:573
msgid "failed to seek past error"
msgstr ""
#: src/pv/transfer.c:601
#: src/pv/transfer.c:593
msgid "skipped past read error"
msgstr ""
#: src/pv/transfer.c:642
#: src/pv/transfer.c:634
msgid "no transfer buffer allocated"
msgstr ""
#: src/pv/transfer.c:684
#: src/pv/transfer.c:676
msgid "failed to set interval timer"
msgstr ""
#: src/pv/transfer.c:710
#: src/pv/transfer.c:702
msgid "failed to clear interval timer"
msgstr ""
#: src/pv/transfer.c:752
#: src/pv/transfer.c:744
msgid "line position buffer allocation failed"
msgstr ""
#: src/pv/transfer.c:925
#: src/pv/transfer.c:917
msgid "write failed"
msgstr ""
#: src/pv/transfer.c:1162
#: src/pv/transfer.c:1154
msgid "select call failed"
msgstr ""
+14 -14
View File
@@ -1,7 +1,7 @@
msgid ""
msgstr ""
"Report-Msgid-Bugs-To: pv@ivarch.com\n"
"POT-Creation-Date: 2024-12-08 17:13+0000\n"
"POT-Creation-Date: 2024-12-08 17:31+0000\n"
"PO-Revision-Date: 2024-10-12 11:13+0000\n"
"Last-Translator: a-j-wood <a-j-wood@users.noreply.translate.codeberg.org>\n"
"Language-Team: French <https://translate.codeberg.org/projects/pv/pv/fr/>\n"
@@ -456,11 +456,11 @@ msgstr ""
msgid "b"
msgstr ""
#: src/pv/display.c:956 src/pv/transfer.c:602
#: src/pv/display.c:956 src/pv/transfer.c:594
msgid "B"
msgstr "O"
#: src/pv/display.c:1497 src/pv/transfer.c:1064
#: src/pv/display.c:1497 src/pv/transfer.c:1056
msgid "buffer allocation failed"
msgstr "échec de l'allocation de mémoire tampon"
@@ -516,47 +516,47 @@ msgstr "l'allocation de la structure de l'historique a échoué"
msgid "file list allocation failed"
msgstr "échec de l'allocation de la liste de fichiers"
#: src/pv/transfer.c:464
#: src/pv/transfer.c:463
msgid "read failed"
msgstr "la lecture a échoué"
#: src/pv/transfer.c:487
#: src/pv/transfer.c:479
msgid "warning: read errors detected"
msgstr "avertissement : erreurs de lecture détectées"
#: src/pv/transfer.c:503
#: src/pv/transfer.c:495
msgid "file is not seekable"
msgstr "ne peut pas se déplacer dans le fichier"
#: src/pv/transfer.c:581
#: src/pv/transfer.c:573
msgid "failed to seek past error"
msgstr "n'a pas réussi à dépasser l'erreur"
#: src/pv/transfer.c:601
#: src/pv/transfer.c:593
msgid "skipped past read error"
msgstr "erreur de lecture dépassée"
#: src/pv/transfer.c:642
#: src/pv/transfer.c:634
msgid "no transfer buffer allocated"
msgstr "aucun tampon de transfert alloué"
#: src/pv/transfer.c:684
#: src/pv/transfer.c:676
msgid "failed to set interval timer"
msgstr ""
#: src/pv/transfer.c:710
#: src/pv/transfer.c:702
msgid "failed to clear interval timer"
msgstr ""
#: src/pv/transfer.c:752
#: src/pv/transfer.c:744
msgid "line position buffer allocation failed"
msgstr ""
#: src/pv/transfer.c:925
#: src/pv/transfer.c:917
msgid "write failed"
msgstr "l'écriture a échoué"
#: src/pv/transfer.c:1162
#: src/pv/transfer.c:1154
msgid "select call failed"
msgstr "l'appel de sélection a échoué"
+14 -14
View File
@@ -6,7 +6,7 @@ msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: pv@ivarch.com\n"
"POT-Creation-Date: 2024-12-08 17:13+0000\n"
"POT-Creation-Date: 2024-12-08 17:31+0000\n"
"PO-Revision-Date: 2024-10-20 14:07+0000\n"
"Last-Translator: coralpink <coralpink@users.noreply.translate.codeberg.org>\n"
"Language-Team: Polish <https://translate.codeberg.org/projects/pv/pv/pl/>\n"
@@ -447,11 +447,11 @@ msgstr "FIN"
msgid "b"
msgstr "b"
#: src/pv/display.c:956 src/pv/transfer.c:602
#: src/pv/display.c:956 src/pv/transfer.c:594
msgid "B"
msgstr "B"
#: src/pv/display.c:1497 src/pv/transfer.c:1064
#: src/pv/display.c:1497 src/pv/transfer.c:1056
msgid "buffer allocation failed"
msgstr "nie udało się zaalokować bufora"
@@ -508,48 +508,48 @@ msgstr "nie udało się zaalokować struktury historii"
msgid "file list allocation failed"
msgstr "nie udało się zaalokować listy plików"
#: src/pv/transfer.c:464
#: src/pv/transfer.c:463
msgid "read failed"
msgstr "błąd odczytu"
#: src/pv/transfer.c:487
#: src/pv/transfer.c:479
msgid "warning: read errors detected"
msgstr "ostrzeżenie: błędy odczytu wykryte"
#: src/pv/transfer.c:503
#: src/pv/transfer.c:495
msgid "file is not seekable"
msgstr "pliku nie da się przewijać"
#: src/pv/transfer.c:581
#: src/pv/transfer.c:573
msgid "failed to seek past error"
msgstr "nie udało się przewinąć za błąd"
#: src/pv/transfer.c:601
#: src/pv/transfer.c:593
msgid "skipped past read error"
msgstr "pominięto błąd odczytu"
#: src/pv/transfer.c:642
#: src/pv/transfer.c:634
msgid "no transfer buffer allocated"
msgstr "brak zaalokowanego bufora transferu"
#: src/pv/transfer.c:684
#: src/pv/transfer.c:676
msgid "failed to set interval timer"
msgstr "nie udało się ustawić interwału czasowego"
# "Przewidywany czas ukończenia" for ETA is too long
#: src/pv/transfer.c:710
#: src/pv/transfer.c:702
msgid "failed to clear interval timer"
msgstr "nie udało się wyczyścić interwału czasowego"
#: src/pv/transfer.c:752
#: src/pv/transfer.c:744
msgid "line position buffer allocation failed"
msgstr "alokacja buforu pozycji linii nie powiodła się"
#: src/pv/transfer.c:925
#: src/pv/transfer.c:917
msgid "write failed"
msgstr "błąd zapisu"
#: src/pv/transfer.c:1162
#: src/pv/transfer.c:1154
msgid "select call failed"
msgstr "nie udało się wywołać funkcji select"
+14 -14
View File
@@ -6,7 +6,7 @@ msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: pv@ivarch.com\n"
"POT-Creation-Date: 2024-12-08 17:13+0000\n"
"POT-Creation-Date: 2024-12-08 17:31+0000\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
@@ -435,11 +435,11 @@ msgstr ""
msgid "b"
msgstr ""
#: src/pv/display.c:956 src/pv/transfer.c:602
#: src/pv/display.c:956 src/pv/transfer.c:594
msgid "B"
msgstr ""
#: src/pv/display.c:1497 src/pv/transfer.c:1064
#: src/pv/display.c:1497 src/pv/transfer.c:1056
msgid "buffer allocation failed"
msgstr "erro alocando o buffer"
@@ -495,47 +495,47 @@ msgstr ""
msgid "file list allocation failed"
msgstr ""
#: src/pv/transfer.c:464
#: src/pv/transfer.c:463
msgid "read failed"
msgstr "erro de leitura"
#: src/pv/transfer.c:487
#: src/pv/transfer.c:479
msgid "warning: read errors detected"
msgstr "aviso: erros de leitura detectados"
#: src/pv/transfer.c:503
#: src/pv/transfer.c:495
msgid "file is not seekable"
msgstr "não pode mover dentro do arquivo"
#: src/pv/transfer.c:581
#: src/pv/transfer.c:573
msgid "failed to seek past error"
msgstr "não pode ir além do erro"
#: src/pv/transfer.c:601
#: src/pv/transfer.c:593
msgid "skipped past read error"
msgstr "ignorado erro de leitura"
#: src/pv/transfer.c:642
#: src/pv/transfer.c:634
msgid "no transfer buffer allocated"
msgstr ""
#: src/pv/transfer.c:684
#: src/pv/transfer.c:676
msgid "failed to set interval timer"
msgstr ""
#: src/pv/transfer.c:710
#: src/pv/transfer.c:702
msgid "failed to clear interval timer"
msgstr ""
#: src/pv/transfer.c:752
#: src/pv/transfer.c:744
msgid "line position buffer allocation failed"
msgstr ""
#: src/pv/transfer.c:925
#: src/pv/transfer.c:917
msgid "write failed"
msgstr "erro de gravação"
#: src/pv/transfer.c:1162
#: src/pv/transfer.c:1154
msgid "select call failed"
msgstr "erro na chamada da função select"
+14 -14
View File
@@ -1,7 +1,7 @@
msgid ""
msgstr ""
"Report-Msgid-Bugs-To: pv@ivarch.com\n"
"POT-Creation-Date: 2024-12-08 17:13+0000\n"
"POT-Creation-Date: 2024-12-08 17:31+0000\n"
"PO-Revision-Date: 2024-10-22 18:07+0000\n"
"Last-Translator: 0ko <0ko@users.noreply.translate.codeberg.org>\n"
"Language-Team: Russian <https://translate.codeberg.org/projects/pv/pv/ru/>\n"
@@ -430,11 +430,11 @@ msgstr "ЗАВЕРШ"
msgid "b"
msgstr "бит"
#: src/pv/display.c:956 src/pv/transfer.c:602
#: src/pv/display.c:956 src/pv/transfer.c:594
msgid "B"
msgstr "байт"
#: src/pv/display.c:1497 src/pv/transfer.c:1064
#: src/pv/display.c:1497 src/pv/transfer.c:1056
msgid "buffer allocation failed"
msgstr "не удалось выделить память для буфера"
@@ -490,47 +490,47 @@ msgstr "не удалось выделить память для структу
msgid "file list allocation failed"
msgstr "не удалось выделить память для списка файлов"
#: src/pv/transfer.c:464
#: src/pv/transfer.c:463
msgid "read failed"
msgstr "чтение не удалось"
#: src/pv/transfer.c:487
#: src/pv/transfer.c:479
msgid "warning: read errors detected"
msgstr "внимание: замечены ошибки чтения"
#: src/pv/transfer.c:503
#: src/pv/transfer.c:495
msgid "file is not seekable"
msgstr ""
#: src/pv/transfer.c:581
#: src/pv/transfer.c:573
msgid "failed to seek past error"
msgstr ""
#: src/pv/transfer.c:601
#: src/pv/transfer.c:593
msgid "skipped past read error"
msgstr ""
#: src/pv/transfer.c:642
#: src/pv/transfer.c:634
msgid "no transfer buffer allocated"
msgstr "не выделена память для буфера передачи"
#: src/pv/transfer.c:684
#: src/pv/transfer.c:676
msgid "failed to set interval timer"
msgstr "не удалось задать измеритель временного промежутка"
#: src/pv/transfer.c:710
#: src/pv/transfer.c:702
msgid "failed to clear interval timer"
msgstr "не удалось очистить измеритель временного промежутка"
#: src/pv/transfer.c:752
#: src/pv/transfer.c:744
msgid "line position buffer allocation failed"
msgstr ""
#: src/pv/transfer.c:925
#: src/pv/transfer.c:917
msgid "write failed"
msgstr "запись не удалась"
#: src/pv/transfer.c:1162
#: src/pv/transfer.c:1154
msgid "select call failed"
msgstr "запрос выборки не удался"
+14 -14
View File
@@ -2,7 +2,7 @@ msgid ""
msgstr ""
"Project-Id-Version: pv 1.8.14\n"
"Report-Msgid-Bugs-To: pv@ivarch.com\n"
"POT-Creation-Date: 2024-12-08 17:13+0000\n"
"POT-Creation-Date: 2024-12-08 17:31+0000\n"
"PO-Revision-Date: 2024-10-12 23:51+0000\n"
"Last-Translator: a-j-wood <a-j-wood@users.noreply.translate.codeberg.org>\n"
"Language-Team: Turkish <https://translate.codeberg.org/projects/pv/pv/tr/>\n"
@@ -431,11 +431,11 @@ msgstr "FIN"
msgid "b"
msgstr "b"
#: src/pv/display.c:956 src/pv/transfer.c:602
#: src/pv/display.c:956 src/pv/transfer.c:594
msgid "B"
msgstr "B"
#: src/pv/display.c:1497 src/pv/transfer.c:1064
#: src/pv/display.c:1497 src/pv/transfer.c:1056
msgid "buffer allocation failed"
msgstr "arabellek tahsisi başarısız oldu"
@@ -491,47 +491,47 @@ msgstr "geçmiş yapısı tahsisi başarısız oldu"
msgid "file list allocation failed"
msgstr "dosya listesi tahsisi başarısız oldu"
#: src/pv/transfer.c:464
#: src/pv/transfer.c:463
msgid "read failed"
msgstr "okuma başarısız"
#: src/pv/transfer.c:487
#: src/pv/transfer.c:479
msgid "warning: read errors detected"
msgstr "uyarı: okuma hataları tespit edildi"
#: src/pv/transfer.c:503
#: src/pv/transfer.c:495
msgid "file is not seekable"
msgstr "dosya aranabilir değil"
#: src/pv/transfer.c:581
#: src/pv/transfer.c:573
msgid "failed to seek past error"
msgstr "geçmiş hatayı aramakta başarısız oldu"
#: src/pv/transfer.c:601
#: src/pv/transfer.c:593
msgid "skipped past read error"
msgstr "geçmiş okuma hatası atlandı"
#: src/pv/transfer.c:642
#: src/pv/transfer.c:634
msgid "no transfer buffer allocated"
msgstr "aktarım arabelleği ayrılmamış"
#: src/pv/transfer.c:684
#: src/pv/transfer.c:676
msgid "failed to set interval timer"
msgstr "aralık zamanlayıcısı ayarlanamadı"
#: src/pv/transfer.c:710
#: src/pv/transfer.c:702
msgid "failed to clear interval timer"
msgstr "aralık zamanlayıcısı temizlenemedi"
#: src/pv/transfer.c:752
#: src/pv/transfer.c:744
msgid "line position buffer allocation failed"
msgstr "satır konumu arabellek tahsisi başarısız oldu"
#: src/pv/transfer.c:925
#: src/pv/transfer.c:917
msgid "write failed"
msgstr "yazma başarısız"
#: src/pv/transfer.c:1162
#: src/pv/transfer.c:1154
msgid "select call failed"
msgstr "seçme çağrısı başarısız oldu"
+1 -1
View File
@@ -382,7 +382,7 @@ bool pv_format(pvstate_t, /*@null@*/ const char *, pvdisplay_t, bool, bool);
void pv_display(pvstate_t, bool);
ssize_t pv_transfer(pvstate_t, int, bool *, bool *, off_t, long *);
int pv_next_file(pvstate_t, unsigned int, int);
/*@out@*/ const char *pv_current_file_name(pvstate_t);
/*@keep@*/ const char *pv_current_file_name(pvstate_t);
void pv_write_retry(int, const char *, size_t);
void pv_tty_write(pvstate_t, const char *, size_t);
-3
View File
@@ -136,9 +136,6 @@ void pv_elapsedtime_add(struct timespec *return_time, const struct timespec *fir
* large enough and are relying on the compiler to do the casting
* correctly, since the manual for timespec(3) states the types are
* implementation-defined.
*
* TODO: review this to make sure that this isn't just an elaborate
* excuse for "it's hard to fix and I don't know how".
*/
}
+1 -1
View File
@@ -390,7 +390,7 @@ int pv_next_file(pvstate_t state, unsigned int filenum, int oldfd)
* internal state and must not be passed to free() or used after "state" is
* freed.
*/
/*@out@*/ const char *pv_current_file_name(pvstate_t state)
/*@keep@*/ const char *pv_current_file_name(pvstate_t state)
{
static char *str_none = NULL;
static char *str_stdin = NULL;
-8
View File
@@ -460,15 +460,7 @@ static int pv__transfer_read(pvstate_t state, int fd, bool *eof_in, bool *eof_ou
* reached the end of this file.
*/
if (do_not_skip_errors) {
/*@-compdef@ */
pv_error(state, "%s: %s: %s", pv_current_file_name(state), _("read failed"), strerror(errno));
/*@+compdef@ */
/*
* splint says the storage pointed to by the result of
* pv_current_file_name() is not fully defined.
*
* TODO: investigate and fix the reason for this.
*/
*eof_in = true;
if (state->transfer.write_position >= state->transfer.read_position) {
*eof_out = true;