[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH v2 03/15] error-report: simplify print_loc()
From: |
marcandre . lureau |
Subject: |
[PATCH v2 03/15] error-report: simplify print_loc() |
Date: |
Tue, 12 Jul 2022 13:35:16 +0400 |
From: Marc-André Lureau <marcandre.lureau@redhat.com>
Pass the program name as "prefix" argument to print_loc() if printing
with "details". This allows to get rid of monitor_cur() call in
print_loc().
Signed-off-by: Marc-André Lureau <marcandre.lureau@redhat.com>
Reviewed-by: Markus Armbruster <armbru@redhat.com>
---
util/error-report.c | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/util/error-report.c b/util/error-report.c
index 893da10f19bc..c43227a975e2 100644
--- a/util/error-report.c
+++ b/util/error-report.c
@@ -138,14 +138,14 @@ void loc_set_file(const char *fname, int lno)
/*
* Print current location to current monitor if we have one, else to stderr.
*/
-static void print_loc(void)
+static void print_loc(const char *prefix)
{
const char *sep = "";
int i;
const char *const *argp;
- if (!monitor_cur() && g_get_prgname()) {
- error_printf("%s:", g_get_prgname());
+ if (prefix) {
+ error_printf("%s:", prefix);
sep = " ";
}
switch (cur_loc->kind) {
@@ -209,7 +209,7 @@ static void vreport(report_type type, const char *fmt,
va_list ap)
error_printf("%s ", error_guest_name);
}
- print_loc();
+ print_loc(detailed ? g_get_prgname() : NULL);
switch (type) {
case REPORT_TYPE_ERROR:
--
2.37.0.rc0
- [PATCH v2 00/15] Preliminary patches for subproject split, marcandre . lureau, 2022/07/12
- [PATCH v2 01/15] error-report: misc comment fix, marcandre . lureau, 2022/07/12
- [PATCH v2 02/15] error-report: introduce "detailed" variable, marcandre . lureau, 2022/07/12
- [PATCH v2 03/15] error-report: simplify print_loc(),
marcandre . lureau <=
- [PATCH v2 04/15] error-report: introduce overridable error_is_detailed(), marcandre . lureau, 2022/07/12
- [PATCH v2 05/15] stubs: remove needless error_vprintf_unless_qmp(), marcandre . lureau, 2022/07/12
- [PATCH v2 06/15] qapi: move QEMU-specific dispatch code in monitor, marcandre . lureau, 2022/07/12
- [PATCH v2 08/15] scripts/qapi: add required system includes to visitor, marcandre . lureau, 2022/07/12
- [PATCH v2 07/15] scripts/qapi-gen: add -i option, marcandre . lureau, 2022/07/12
- [PATCH v2 09/15] util: move 256-by-128 division helpers to int128, marcandre . lureau, 2022/07/12