URL: https://code.wireshark.org/review/gitweb?p=wireshark.git;a=commit;h=2a38dc74ede3eba69f0d73b61f1735a4036528c1
Submitter: Guy Harris (guy@xxxxxxxxxxxx)
Changed: branch: master
Repository: wireshark
Commits:
2a38dc7 by Guy Harris (guy@xxxxxxxxxxxx):
Have scan_plugins() take an argument specify what to do on load failures.
That's a less gross hack to suppress load failures due to not having
libwiretap than providing a no-op failure-message routine, as it at
least allows other code using a failure-message routine, such as
cmdarg_err() and routines that call it, to be used.
We really should put libwiretap and libwireshark plugins into separate
subdirectories of the plugin directories, and avoid even looking at
libwireshark plugins in programs that don't use libwireshark.
Change-Id: I0a6ec01ecb4e718ed36233cfaf638a317f839a73
Reviewed-on: https://code.wireshark.org/review/17506
Reviewed-by: Guy Harris <guy@xxxxxxxxxxxx>
Actions performed:
from ae87794 Report an error if the channel type isn't valid.
adds 2a38dc7 Have scan_plugins() take an argument specify what to do on load failures.
Summary of changes:
capinfos.c | 18 +++++++++++-------
captype.c | 18 +++++++++++-------
dftest.c | 2 +-
editcap.c | 17 +++++++++++------
mergecap.c | 18 +++++++++++-------
randpkt.c | 19 ++++++++++++-------
reordercap.c | 18 +++++++++++-------
tfshark.c | 2 +-
tshark.c | 2 +-
ui/gtk/main.c | 2 +-
wireshark-qt.cpp | 2 +-
wsutil/plugins.c | 29 +++++++++++++++++++++--------
wsutil/plugins.h | 6 +++++-
13 files changed, 98 insertions(+), 55 deletions(-)