* [PATCH] abicompat: Add prompt message for abnormal operation
@ 2021-11-05 9:36 tangmeng
0 siblings, 0 replies; 2+ messages in thread
From: tangmeng @ 2021-11-05 9:36 UTC (permalink / raw)
To: libabigail; +Cc: tangmeng
When using abicompat, if the --redundant option and --no-redundant
option are used at the same time, no error will be prompted, the
actual option will prevail.
This patch provides a error to notify the user that error.
* tools/abicompat.cc (main): Notify the user when --redundant
and --no-redundant are used at the same time
Signed-off-by: tangmeng <tangmeng@uniontech.com>
---
tools/abicompat.cc | 20 ++++++++++++++++++--
1 file changed, 18 insertions(+), 2 deletions(-)
diff --git a/tools/abicompat.cc b/tools/abicompat.cc
index cf944a49..de5043ea 100644
--- a/tools/abicompat.cc
+++ b/tools/abicompat.cc
@@ -71,6 +71,8 @@ public:
bool list_undefined_symbols_only;
bool show_base_names;
bool show_redundant;
+ bool seted_redundant;
+ bool seted_no_redundant;
bool show_locs;
options(const char* program_name)
@@ -191,9 +193,15 @@ parse_command_line(int argc, char* argv[], options& opts)
++i;
}
else if (!strcmp(argv[i], "--redundant"))
- opts.show_redundant = true;
+ {
+ opts.show_redundant = true;
+ opts.seted_redundant = true;
+ }
else if (!strcmp(argv[i], "--no-redundant"))
- opts.show_redundant = false;
+ {
+ opts.show_redundant = false;
+ opts.seted_no_redundant = true;
+ }
else if (!strcmp(argv[i], "--no-show-locs"))
opts.show_locs = false;
else if (!strcmp(argv[i], "--help")
@@ -645,6 +653,14 @@ main(int argc, char* argv[])
<< opts.lib2_path << " will be ignored automatically\n";
}
+ if (opts.seted_redundant && opts.seted_no_redundant)
+ {
+ emit_prefix(argv[0], cerr)
+ << "ERROR: The \'--redundant\' and '--no-redundant' option are in conflict. "
+ << "Please select only one option to use.\n";
+ return 1;
+ }
+
ABG_ASSERT(!opts.app_path.empty());
if (!abigail::tools_utils::check_file(opts.app_path, cerr, opts.prog_name))
return abigail::tools_utils::ABIDIFF_ERROR;
--
2.20.1
^ permalink raw reply [flat|nested] 2+ messages in thread
* [PATCH] abicompat: Add prompt message for abnormal operation
@ 2021-10-29 8:58 tangmeng
0 siblings, 0 replies; 2+ messages in thread
From: tangmeng @ 2021-10-29 8:58 UTC (permalink / raw)
To: libabigail; +Cc: tangmeng
When using abicompat, if the user configures the
lib2 path while using the xxx option, the configuration
of lib2 is not actually processed in the command
execution process, and there is no prompt message.
It will cause lib2 to be considered to have been processed,
so a warning is added here to prompt the user.
* tools/abicompat.cc (main): Add warning tips for some actions
Signed-off-by: tangmeng <tangmeng@uniontech.com>
---
tools/abicompat.cc | 9 ++++++++-
1 file changed, 8 insertions(+), 1 deletion(-)
diff --git a/tools/abicompat.cc b/tools/abicompat.cc
index 60cd794f..989915f3 100644
--- a/tools/abicompat.cc
+++ b/tools/abicompat.cc
@@ -390,7 +390,7 @@ perform_compat_check_in_normal_mode(options& opts,
return status;
}
-/// An description of a change of the type of a function. It contains
+/// An description of a change of the type of a function. It contains
/// the declaration of the function we are interested in, as well as
/// the differences found in the type of that function.
struct fn_change
@@ -638,6 +638,13 @@ main(int argc, char* argv[])
return 0;
}
+ if (opts.weak_mode && !opts.lib2_path.empty())
+ {
+ emit_prefix(argv[0], cout)
+ << "WARNING: The \'--weak-mode\' option is used. The "
+ << opts.lib2_path << " will not be ignored automatically\n";
+ }
+
ABG_ASSERT(!opts.app_path.empty());
if (!abigail::tools_utils::check_file(opts.app_path, cerr, opts.prog_name))
return abigail::tools_utils::ABIDIFF_ERROR;
--
2.20.1
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2021-11-05 9:37 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2021-11-05 9:36 [PATCH] abicompat: Add prompt message for abnormal operation tangmeng
-- strict thread matches above, loose matches on Subject: below --
2021-10-29 8:58 tangmeng
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).