git: a9b30c92ab1c - stable/14 - bsddialog: Correct type for bsddialog_total_progview
- Go to: [ bottom of page ] [ top of archives ] [ this month ]
Date: Fri, 09 May 2025 16:59:54 UTC
The branch stable/14 has been updated by emaste:
URL: https://cgit.FreeBSD.org/src/commit/?id=a9b30c92ab1c0dbed31eed94b8b975eb574d2a3f
commit a9b30c92ab1c0dbed31eed94b8b975eb574d2a3f
Author: Ed Maste <emaste@FreeBSD.org>
AuthorDate: 2025-05-09 00:35:10 +0000
Commit: Ed Maste <emaste@FreeBSD.org>
CommitDate: 2025-05-09 16:58:11 +0000
bsddialog: Correct type for bsddialog_total_progview
It was an int, but printed with %lli format. Although it would be
reasonable to use a 32-bit int here (i.e., changing the printf format
instead) this matches what was done in bsddialog upstream (and now in
main).
PR: 286655
Reviewed by: asiciliano
Sponsored by: The FreeBSD Foundation
Differential Revision: https://reviews.freebsd.org/D50261
---
contrib/bsddialog/lib/barbox.c | 4 ++--
contrib/bsddialog/lib/bsddialog_progressview.h | 4 ++--
2 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/contrib/bsddialog/lib/barbox.c b/contrib/bsddialog/lib/barbox.c
index 71759839a709..d9b4070b3e0c 100644
--- a/contrib/bsddialog/lib/barbox.c
+++ b/contrib/bsddialog/lib/barbox.c
@@ -47,7 +47,7 @@
bool bsddialog_interruptprogview;
bool bsddialog_abortprogview;
-int bsddialog_total_progview;
+long long int bsddialog_total_progview;
static void
draw_bar(WINDOW *win, int y, int x, int barlen, int perc, bool withlabel,
@@ -747,4 +747,4 @@ bsddialog_pause(struct bsddialog_conf *conf, const char *text, int rows,
end_dialog(conf, shadow, widget, textpad);
return (retval);
-}
\ No newline at end of file
+}
diff --git a/contrib/bsddialog/lib/bsddialog_progressview.h b/contrib/bsddialog/lib/bsddialog_progressview.h
index 0cd9368a1040..af10d813f5f9 100644
--- a/contrib/bsddialog/lib/bsddialog_progressview.h
+++ b/contrib/bsddialog/lib/bsddialog_progressview.h
@@ -36,7 +36,7 @@
extern bool bsddialog_interruptprogview;
extern bool bsddialog_abortprogview;
-extern int bsddialog_total_progview;
+extern long long int bsddialog_total_progview;
struct bsddialog_fileminibar {
const char *path;
@@ -57,4 +57,4 @@ bsddialog_progressview (struct bsddialog_conf *conf, const char *text, int rows,
int cols, struct bsddialog_progviewconf *pvconf, unsigned int nminibar,
struct bsddialog_fileminibar *minibar);
-#endif
\ No newline at end of file
+#endif