mirrors/pv
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Pass through indent.

Browse Source
This commit is contained in:
Andrew Wood
2025-09-14 16:42:08 +01:00
parent 1e6c9704b1
commit f70627c031
2 changed files with 5 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/pv/file.c
+3 -5
View File
@@ -325,15 +325,14 @@ int pv_next_file(pvstate_t state, unsigned int filenum, int oldfd)
if ((NULL == next_filename) || (0 == strcmp(next_filename, "-"))) {
fd = STDIN_FILENO;
} else {
fd = open(next_filename, O_RDONLY); /* flawfinder: ignore */
fd = open(next_filename, O_RDONLY); /* flawfinder: ignore */
/*
* flawfinder rationale: the input file list is under the
* control of the operator by its nature, so we can't refuse
* to open symlinks etc as that would be counterintuitive.
*/
if (fd < 0) {
pv_error("%s: %s: %s",
_("failed to read file"), next_filename, strerror(errno));
pv_error("%s: %s: %s", _("failed to read file"), next_filename, strerror(errno));
state->status.exit_status |= PV_ERROREXIT_ACCESS;
return -1;
}
@@ -370,8 +369,7 @@ int pv_next_file(pvstate_t state, unsigned int filenum, int oldfd)
input_file_is_output = false;
if (input_file_is_output) {
pv_error("%s: %s", _("input file is output file"),
NULL == next_filename ? "-" : next_filename);
pv_error("%s: %s", _("input file is output file"), NULL == next_filename ? "-" : next_filename);
(void) close(fd);
state->status.exit_status |= PV_ERROREXIT_OUROBOROS;
return -1;
src/pv/state.c
+2 -2
View File
@@ -667,7 +667,7 @@ void pv_state_set_terminal_supports_utf8(pvstate_t state, bool val)
void pv_state_inputfiles(pvstate_t state, unsigned int input_file_count, const char **input_files)
{
unsigned int file_idx;
/*@only@*/ nullable_string_t *new_array;
/*@only@ */ nullable_string_t *new_array;
/* Free the old array and its contents, if there was one. */
if (NULL != state->files.filename) {
@@ -691,7 +691,7 @@ void pv_state_inputfiles(pvstate_t state, unsigned int input_file_count, const c
/* Populate the new array with copies of the filenames. */
for (file_idx = 0; file_idx < input_file_count; file_idx++) {
/*@only@*/ char *new_string;
/*@only@ */ char *new_string;
new_string = pv_strdup(input_files[file_idx]);
if (NULL == new_string) {
/*@-mustfreefresh@ *//* see similar _() issue above */