Fix a couple minor issues

Print a warning if remove() fails, and check if the win pointer is null
before using it (this is unnecessary but it's correct and shuts coverity up)
This commit is contained in:
jfreegman 2020-11-26 18:25:37 -05:00
parent 0d8e6d713e
commit 61740bda85
No known key found for this signature in database
GPG Key ID: 3627F3144076AE63
2 changed files with 7 additions and 2 deletions

View File

@ -242,7 +242,10 @@ static void print_wrap(WINDOW *win, struct line_info *line, int max_x)
print_n_chars(win, msg, space_idx);
msg += space_idx + 1;
length -= (space_idx + 1);
waddch(win, '\n');
if (win) {
waddch(win, '\n');
}
} else {
print_n_chars(win, msg, x_limit);
msg += x_limit;

View File

@ -358,7 +358,9 @@ int rename_logfile(const char *src, const char *dest, const char *selfkey, const
}
if (file_exists(newpath)) {
remove(oldpath);
if (remove(oldpath) != 0) {
fprintf(stderr, "Warning: remove() failed to remove log path `%s`\n", oldpath);
}
} else if (rename(oldpath, newpath) != 0) {
goto on_error;
}