X-Git-Url: https://git.lttng.org/?p=lttng-tools.git;a=blobdiff_plain;f=src%2Fcommon%2Fargpar-utils%2Fargpar-utils.c;fp=src%2Fcommon%2Fargpar-utils%2Fargpar-utils.c;h=6f5548917abf755f2c7fda3c9776f08a7d2de2d6;hp=1f1f38bccdb69afac143ec88c092089688ff3bac;hb=b1a5fb96e7a9385fe421be9d4ab21a75ea11032f;hpb=d50d200af8d01f4b58a14e384cabd46b1afb4817

diff --git a/src/common/argpar-utils/argpar-utils.c b/src/common/argpar-utils/argpar-utils.c
index 1f1f38bcc..6f5548917 100644
--- a/src/common/argpar-utils/argpar-utils.c
+++ b/src/common/argpar-utils/argpar-utils.c
@@ -54,7 +54,7 @@ char *format_arg_error_v(const struct argpar_error *error,
 	{
 	case ARGPAR_ERROR_TYPE_MISSING_OPT_ARG:
 	{
-		int orig_index = argpar_error_orig_index(error);
+		const int orig_index = argpar_error_orig_index(error);
 		const char *arg = argv[orig_index];
 
 		ret = strutils_appendf(&str,
@@ -92,10 +92,12 @@ char *format_arg_error_v(const struct argpar_error *error,
 	}
 	case ARGPAR_ERROR_TYPE_UNKNOWN_OPT:
 	{
+		int orig_index = argpar_error_orig_index(error);
 		const char *unknown_opt = argpar_error_unknown_opt_name(error);
 
 		ret = strutils_appendf(&str,
-			"Unknown option `%s`", unknown_opt);
+			WHILE_PARSING_ARG_N_ARG_FMT "Unknown option `%s`",
+			orig_index + 1, argv[orig_index], unknown_opt);
 
 		if (ret < 0) {
 			goto end;