| Message ID | DB6PR0101MB221424AD50B0C338A7773F5E8F749@DB6PR0101MB2214.eurprd01.prod.exchangelabs.com |
|---|---|
| State | Superseded |
| Headers | show |
| Series | [FFmpeg-devel,1/3] fftools/cmdutils: Add function to report error before exit | expand |
On 8/27/2022 10:55 AM, Andreas Rheinhardt wrote: > This is designed to improve and unify error handling for > allocation failures for the many (often small) allocations that we have > in the fftools. These typically either don't return an error message > or an error message that is not really helpful to the user > and can be replaced by a generic error message without loss of > information. > > Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@outlook.com> > --- > fftools/cmdutils.c | 6 ++++++ > fftools/cmdutils.h | 11 +++++++++++ > 2 files changed, 17 insertions(+) > > diff --git a/fftools/cmdutils.c b/fftools/cmdutils.c > index 18e768b386..b6f5c01ca3 100644 > --- a/fftools/cmdutils.c > +++ b/fftools/cmdutils.c > @@ -90,6 +90,12 @@ void register_exit(void (*cb)(int ret)) > program_exit = cb; > } > > +void report_error_then_exit_program(int ret) Maybe report_and_exit instead. report_error_then_exit_program is IMO too long. > +{ > + av_log(NULL, AV_LOG_FATAL, "%s\n", av_err2str(ret)); > + exit_program(AVUNERROR(ret)); > +} > + > void exit_program(int ret) > { > if (program_exit) > diff --git a/fftools/cmdutils.h b/fftools/cmdutils.h > index d87e162ccd..358f0a0ef9 100644 > --- a/fftools/cmdutils.h > +++ b/fftools/cmdutils.h > @@ -54,6 +54,17 @@ extern int hide_banner; > */ > void register_exit(void (*cb)(int ret)); > > +/** > + * Reports an error corresponding to the provided > + * AVERROR code and calls exit_program() with the > + * corresponding POSIX error code. > + * @note ret must be an AVERROR-value of a POSIX error code > + * (i.e. AVERROR(EFOO) and not AVERROR_FOO). > + * library functions can return both, so call this only > + * with AVERROR(EFOO) of your own. > + */ > +void report_error_then_exit_program(int ret) av_noreturn; > + > /** > * Wraps exit with a program-specific cleanup routine. > */
James Almer: > > > On 8/27/2022 10:55 AM, Andreas Rheinhardt wrote: >> This is designed to improve and unify error handling for >> allocation failures for the many (often small) allocations that we have >> in the fftools. These typically either don't return an error message >> or an error message that is not really helpful to the user >> and can be replaced by a generic error message without loss of >> information. >> >> Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@outlook.com> >> --- >> fftools/cmdutils.c | 6 ++++++ >> fftools/cmdutils.h | 11 +++++++++++ >> 2 files changed, 17 insertions(+) >> >> diff --git a/fftools/cmdutils.c b/fftools/cmdutils.c >> index 18e768b386..b6f5c01ca3 100644 >> --- a/fftools/cmdutils.c >> +++ b/fftools/cmdutils.c >> @@ -90,6 +90,12 @@ void register_exit(void (*cb)(int ret)) >> program_exit = cb; >> } >> +void report_error_then_exit_program(int ret) > > Maybe report_and_exit instead. report_error_then_exit_program is IMO too > long. > Good suggestion. Will do so. >> +{ >> + av_log(NULL, AV_LOG_FATAL, "%s\n", av_err2str(ret)); >> + exit_program(AVUNERROR(ret)); >> +} >> + >> void exit_program(int ret) >> { >> if (program_exit) >> diff --git a/fftools/cmdutils.h b/fftools/cmdutils.h >> index d87e162ccd..358f0a0ef9 100644 >> --- a/fftools/cmdutils.h >> +++ b/fftools/cmdutils.h >> @@ -54,6 +54,17 @@ extern int hide_banner; >> */ >> void register_exit(void (*cb)(int ret)); >> +/** >> + * Reports an error corresponding to the provided >> + * AVERROR code and calls exit_program() with the >> + * corresponding POSIX error code. >> + * @note ret must be an AVERROR-value of a POSIX error code >> + * (i.e. AVERROR(EFOO) and not AVERROR_FOO). >> + * library functions can return both, so call this only >> + * with AVERROR(EFOO) of your own. >> + */ >> +void report_error_then_exit_program(int ret) av_noreturn; >> + >> /** >> * Wraps exit with a program-specific cleanup routine. >> */
diff --git a/fftools/cmdutils.c b/fftools/cmdutils.c index 18e768b386..b6f5c01ca3 100644 --- a/fftools/cmdutils.c +++ b/fftools/cmdutils.c @@ -90,6 +90,12 @@ void register_exit(void (*cb)(int ret)) program_exit = cb; } +void report_error_then_exit_program(int ret) +{ + av_log(NULL, AV_LOG_FATAL, "%s\n", av_err2str(ret)); + exit_program(AVUNERROR(ret)); +} + void exit_program(int ret) { if (program_exit) diff --git a/fftools/cmdutils.h b/fftools/cmdutils.h index d87e162ccd..358f0a0ef9 100644 --- a/fftools/cmdutils.h +++ b/fftools/cmdutils.h @@ -54,6 +54,17 @@ extern int hide_banner; */ void register_exit(void (*cb)(int ret)); +/** + * Reports an error corresponding to the provided + * AVERROR code and calls exit_program() with the + * corresponding POSIX error code. + * @note ret must be an AVERROR-value of a POSIX error code + * (i.e. AVERROR(EFOO) and not AVERROR_FOO). + * library functions can return both, so call this only + * with AVERROR(EFOO) of your own. + */ +void report_error_then_exit_program(int ret) av_noreturn; + /** * Wraps exit with a program-specific cleanup routine. */
This is designed to improve and unify error handling for allocation failures for the many (often small) allocations that we have in the fftools. These typically either don't return an error message or an error message that is not really helpful to the user and can be replaced by a generic error message without loss of information. Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@outlook.com> --- fftools/cmdutils.c | 6 ++++++ fftools/cmdutils.h | 11 +++++++++++ 2 files changed, 17 insertions(+)