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

Pass state->status, rather than state itself, to pv_format (#165).

Browse Source
This commit is contained in:
Andrew Wood
2025-07-27 00:31:45 +01:00
parent da2a2e6fd2
commit 960ff1572f
2 changed files with 9 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/include/pv-internal.h
+1 -1
View File
@@ -559,7 +559,7 @@ pvdisplay_bytecount_t pv_formatter_previous_line(pvformatter_args_t);
pvdisplay_bytecount_t pv_formatter_name(pvformatter_args_t);
pvdisplay_bytecount_t pv_formatter_sgr(pvformatter_args_t);
bool pv_format(pvstate_t, pvcontrol_t, readonly_pvtransferstate_t, readonly_pvtransfercalc_t, /*@null@*/ const char *, pvdisplay_t, bool, bool);
bool pv_format(pvprogramstatus_t, pvcontrol_t, readonly_pvtransferstate_t, readonly_pvtransfercalc_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);
src/pv/display.c
+8 -6
View File
@@ -946,7 +946,7 @@ static void pv__format_init(pvcontrol_t control, readonly_pvtransferstate_t tran
/*
* Update display->display_buffer with status information formatted
* according to the state held within the given structure.
* according to the state held within the given structures.
*
* If "reinitialise" is true, the format string is reparsed first. This
* should be true for the first call, and true whenever the format is
@@ -961,9 +961,11 @@ static void pv__format_init(pvcontrol_t control, readonly_pvtransferstate_t tran
* display->display_string_len to the length of the string in
* display->display_buffer, in bytes.
*
* Updates status->exit_status if buffer allocation fails.
*
* See pv__format_init for the adjustments that may be made to "control".
*/
bool pv_format(pvstate_t state, pvcontrol_t control, readonly_pvtransferstate_t transfer,
bool pv_format(pvprogramstatus_t status, pvcontrol_t control, readonly_pvtransferstate_t transfer,
readonly_pvtransfercalc_t calc, /*@null@ */ const char *format_supplied, pvdisplay_t display,
bool reinitialise, bool final)
{
@@ -1042,7 +1044,7 @@ bool pv_format(pvstate_t state, pvcontrol_t control, readonly_pvtransferstate_t
new_buffer = malloc(new_size + 16);
if (NULL == new_buffer) {
pv_error("%s: %s", _("buffer allocation failed"), strerror(errno));
state->status.exit_status |= PV_ERROREXIT_MEMORY;
status->exit_status |= PV_ERROREXIT_MEMORY;
display->display_buffer = NULL;
return false;
}
@@ -1268,14 +1270,14 @@ void pv_display(pvstate_t state, bool final)
}
if (!pv_format
(state, &(state->control), &(state->transfer), &(state->calc), state->control.format_string,
(&(state->status), &(state->control), &(state->transfer), &(state->calc), state->control.format_string,
&(state->display), reinitialise, final))
return;
if (0 != state->control.extra_displays) {
if (!pv_format
(state, &(state->control), &(state->transfer), &(state->calc), state->control.extra_format_string,
&(state->extra_display), reinitialise, final))
(&(state->status), &(state->control), &(state->transfer), &(state->calc),
state->control.extra_format_string, &(state->extra_display), reinitialise, final))
return;
}