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
+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;